Suprabh Shukla dca3b5d7c9 Merge "Changed interceptor dialog text for suspended apps" into pi-dev am: 6982d3ee2a ...

am: e99e98478e

Change-Id: I487bf73c572c8fa0e7481bbc701d27534ec17a77

2018-05-11 05:47:02 -07:00

..

java

Merge "Add a path to allow detection of task changes to the top of the ActivityView" into pi-dev am: 47a8ecce90

2018-05-10 20:29:49 -07:00

jni

Merge "Move registration of AssetManager.mObject to zygote." into pi-dev am: 85ec63532f

2018-05-11 03:38:58 -07:00

proto

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

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

res

Merge "Changed interceptor dialog text for suspended apps" into pi-dev am: 6982d3ee2a

2018-05-11 05:47:02 -07:00

tests

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

2018-05-10 15:44:50 -07:00