Amith Yamasani 6c608ebafb Merge "MASTER_CLEAR action should not be public" into oc-dev ...

am: baf1d7036e

Change-Id: I361e8369ec16da7d032680530223463228921616

2017-04-14 23:57:05 +00:00

..

java

Merge "MASTER_CLEAR action should not be public" into oc-dev

2017-04-14 23:57:05 +00:00

jni

Merge "Add BitmapFactory.Options.inColorSpace" into oc-dev

2017-04-14 21:08:42 +00:00

proto/android

Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED

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

res

Merge "Implement new splash screen API" into oc-dev

2017-04-14 12:02:08 +00:00

tests

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

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