Todd Kennedy f08b40642a Merge changes from topic "b_78809704" into pi-dev ...

am: 92b64bb1bb

Change-Id: I08a9b59d00c9e7aa075c21c44b582d571fe79fd7

2018-05-11 11:15:10 -07:00

..

java

Merge changes from topic "b_78809704" into pi-dev

2018-05-11 11:15:10 -07:00

jni

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

2018-05-11 03:29:21 -07: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 10:57:49 -07:00

tests

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

2018-05-10 13:10:15 -07:00