| commit | 2a5663d524a29cc33137a6651660506398d0633a | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Fri Nov 21 02:47:16 2014 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Nov 21 02:47:16 2014 +0000 |
| tree | 64a4f392d784651b4466443691b498e27384d57a | |
| parent | cf047b5d554b35e504f33994f3a07624c2690633 [diff] | |
| parent | 62a7d5334315b4153f1da1112f945d13f72e0381 [diff] |
am 4e312d81: Merge "Add device locked API for TrustAgentService" into lmp-mr1-dev automerge: 62a7d53 * commit '62a7d5334315b4153f1da1112f945d13f72e0381': Add device locked API for TrustAgentService