Christopher Tate b5573283ab Merge "Introduce NETWORK_TYPE_METERED job constraint" into oc-dev ...

am: 28dab313ee

Change-Id: I369ba9ee166d4812f2df929903691352e7bafe11

2017-04-14 19:09:27 +00:00

..

java

Merge "Introduce NETWORK_TYPE_METERED job constraint" into oc-dev

2017-04-14 19:09:27 +00:00

jni

Bug fix: use legacy SkCanvas regardless of color space tag

2017-04-14 16:26:50 +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