Bo Zhu 542dbb9734 Merge "Revert "Revert "Change the root of trust for CryptAuth Vault Service""" into pi-dev ...

am: 90dbb0ed72

Change-Id: I96ddaa531db00ec6e925b276e5ba137af51bfed5

2018-05-11 09:59:59 -07:00

..

java

Merge "Revert "Revert "Change the root of trust for CryptAuth Vault Service""" into pi-dev

2018-05-11 09:59: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 "Changed interceptor dialog text for suspended apps" into pi-dev

2018-05-11 05:34:16 -07:00

tests

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

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