Makoto Onuki 58105199f5 resolve merge conflicts of 25e893c7d5d3 to master ...

Test: build

Change-Id: I43d3eb486d8a6600cfc793d6324b8fe23a241f0f

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

..

java

resolve merge conflicts of 25e893c7d5d3 to master

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

jni

Merge "Add BitmapFactory.Options.inColorSpace" into oc-dev am: c99bcc69f7

2017-04-14 21:19:25 +00:00

proto/android

Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED

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

res

Merge "Service for OEM lock management." into oc-dev am: e52a1bfede

2017-04-14 18:01:24 +00:00

tests

Merge "Remove unnecessary casts on calls to findViewById" into oc-dev am: 7c8ab2651b

2017-04-14 18:25:53 +00:00