Adrian Roos 4d4254fdc3 am 2a5663d5: am 4e312d81: Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev automerge: 62a7d53 ...

* commit '2a5663d524a29cc33137a6651660506398d0633a':
  Add device locked API for TrustAgentService

2014-11-21 02:58:07 +00:00

..

java/com/android/server

am 2a5663d5: am 4e312d81: Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev automerge: 62a7d53

2014-11-21 02:58:07 +00:00

jni

resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp

2014-11-12 13:24:42 -08:00

Android.mk

…