| commit | 767ae175fab5a93f4948b3722549448eb4b55e41 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Thu Nov 06 03:07:09 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 06 03:07:09 2014 +0000 |
| tree | c1f6c880004ab69bc5397fcbff8b972869e10acd | |
| parent | 9beb54db9ef78c23dd06822a6e3426d6374b26c2 [diff] | |
| parent | 6230cdf5721f11660e2c0fec1c5695346a9001d0 [diff] |
am 6230cdf5: am 262dc4da: Merge "Update TrustAgentService API after review" into lmp-mr1-dev * commit '6230cdf5721f11660e2c0fec1c5695346a9001d0': Update TrustAgentService API after review