Winson Chung 59ff523949 Merge changes from topic "sysui_flags_drop" into pi-dev ...

am: 53ae6a82cd

Change-Id: I88661e52aedee934e5b5cdbfd1d457d2c6a7d1c1

2018-05-11 15:59:45 -07:00

..

java

Merge changes from topic "sysui_flags_drop" into pi-dev

2018-05-11 15:59:45 -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 "GM2 icon updates" into pi-dev

2018-05-11 14:50:07 -07:00

tests

Merge "Show settings suggestion" into pi-dev

2018-05-11 14:09:30 -07:00