Dianne Hackborn 59c6507670 Merge "Allow appops command to modify uid ops." into oc-dev ...

am: 81bfe1f62e

Change-Id: I843f40212346a3edaf219af5ec47ba16428914ad

2017-04-12 21:51:00 +00:00

..

java

Merge "Allow appops command to modify uid ops." into oc-dev

2017-04-12 21:51:00 +00:00

jni

Merge "Add new "work queue" feature to JobScheduler." into oc-dev

2017-04-12 17:55:56 +00:00

proto/android

Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED

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

res

Merge "Make QS light" into oc-dev

2017-04-12 20:50:32 +00:00

tests

Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev

2017-04-12 19:52:07 +00:00