Makoto Onuki 25e893c7d5 Merge "Fix the wrong IMPORTANCE_ values." into oc-dev ...

am: 5f085792f6

Change-Id: I263f5cd22bf45a0b7f2f8599d28807e6464a5c2c

2017-04-14 23:39:03 +00:00

..

java

Merge "Fix the wrong IMPORTANCE_ values." into oc-dev

2017-04-14 23:39:03 +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