| commit | 4d4254fdc35b455343268b04d70003917122cfa6 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Fri Nov 21 02:58:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 21 02:58:07 2014 +0000 |
| tree | bebcd386205ca5bbb77fd6a025e173412d4c2738 | |
| parent | 05576cc784fef0067c5b03ed85291b41d9098877 [diff] | |
| parent | 2a5663d524a29cc33137a6651660506398d0633a [diff] |
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