Amith Yamasani 98fd4fa0f4 Merge "Add limits to App Usage Observer Api" into pi-dev

2018-05-11 19:03:11 +00:00

..

java

Merge "Add limits to App Usage Observer Api" into pi-dev

2018-05-11 19:03:11 +00:00

jni

Merge "Move registration of AssetManager.mObject to zygote." into pi-dev

2018-05-11 10:13:42 +00:00

proto

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

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

res

Merge "Fix active permission touch target too small" into pi-dev

2018-05-11 17:37:35 +00:00

tests

Merge "VintfObjectTest: fix test with respect to deprecation schedule changes" into pi-dev

2018-05-10 19:58:00 +00:00