Victor Hsieh 5c195ee292 Merge "Allow only selected priv apps to run OOB" into pi-dev ...

am: 792d36c170

Change-Id: Iad80a321e1b76f19935a23290594a36fd057840c

2018-05-09 12:37:38 -07:00

..

java

Merge "Allow only selected priv apps to run OOB" into pi-dev

2018-05-09 12:37:38 -07:00

jni

Merge "Allow AssetStreamAdaptor to be seekable" into pi-dev

2018-05-09 10:00:57 -07:00

proto

Merge "Show "in parole?" in dumpsys jobscheduler" into pi-dev

2018-05-08 18:09:56 +00:00

res

Merge "Add watch specific tweaks to global actions layouts." into pi-dev

2018-05-08 19:07:12 -07:00

tests

Merge "Allow only selected priv apps to run OOB" into pi-dev

2018-05-09 12:37:38 -07:00