Adrian Roos 70fd44fa02 am 698078a7: Merge "Improve TrustManagerService user lifecycle" into lmp-mr1-dev ...

automerge: 7736d37

* commit '7736d37568980fdcee9c261de8a207977a720bb9':
  Improve TrustManagerService user lifecycle

2014-11-03 18:41:28 +00:00

..

java/com/android/server

am 698078a7: Merge "Improve TrustManagerService user lifecycle" into lmp-mr1-dev

2014-11-03 18:41:28 +00:00

jni

…

Android.mk

…