| commit | ed741c0918cb2aae8d8ff677ea80e62e577d6064 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Fri Aug 22 23:37:41 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 22 23:37:41 2014 +0000 |
| tree | 52a49d96fb6d82df0ee92158597e508ae1488380 | |
| parent | a70a6f03f831777c008add292e672fd1cd1c50f3 [diff] | |
| parent | db2fb70b19d7fef44ff975ccaabd8cf4f3a4c4f0 [diff] |
am 9cb8e236: am 752889a9: am 9af7f4f6: Merge "Update TrustAgentService API after review." into lmp-dev * commit '9cb8e236fcb386701f5be9f18465bc304bb46c19': Update TrustAgentService API after review.