Dieter Hsu 62a0d4f32e Merge "Fix active permission touch target too small" into pi-dev ...

am: bb668a2bb7

Change-Id: I92aa46fd58e565a40ae7ccb52b76e9567cced2a9

2018-05-11 10:57:49 -07:00

..

java

Merge "Allow onGetSliceDescendants to be slow" into pi-dev

2018-05-11 10:37:59 -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