Romain Guy 2439e19d41 Merge "Properly decode colors spaces in BitmapRegionDecoder" into oc-dev ...

am: 5b52cf6274

Change-Id: I86284be4dc506b6f4243ae27c4df848d874ca912

2017-04-17 18:33:23 +00:00

..

java

Merge "Temporary remove resource-display caching" into oc-dev

2017-04-17 17:08:29 +00:00

jni

Merge "Properly decode colors spaces in BitmapRegionDecoder" into oc-dev

2017-04-17 18:20:18 +00:00

proto/android

Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED

2017-04-12 07:00:51 -07:00

res

Merge "Add a default SSID prefix for local only hotspot" into oc-dev

2017-04-15 20:37:37 +00:00

tests

Merge "Remove unnecessary casts on calls to findViewById" into oc-dev

2017-04-14 17:04:19 +00:00