Matt Sarett 7678d6b19a Merge "Fix uses of SkImageInfo in BitmapFactory to preserve color space info"

2016-06-03 16:04:14 +00:00

..

java

Merge "ShortcutManager: Implement usage report API" into nyc-mr1-dev am: 37087ad710

2016-06-03 15:44:53 +00:00

jni

Fix uses of SkImageInfo in BitmapFactory to preserve color space info

2016-06-03 14:39:10 +00:00

res

Merge "Round icons" into nyc-mr1-dev am: 7d64d64269

2016-06-03 00:44:54 +00:00

tests

Merge "Fix crash with intent-less actions" into nyc-dev am: ac2b44f502 am: 7a845c5283

2016-05-31 21:15:31 +00:00