commit | 74160d8cdb2d6d63ebb9c904cb6b83271d96555c | [log] [tgz] |
---|---|---|
author | Jim Miller <jaggies@google.com> | Wed Feb 25 18:30:10 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 25 18:30:10 2015 +0000 |
tree | 31109654ba29b705d0ce8258a4c8bea1c6b45892 | |
parent | c718455cc11d9d9441a405ba522359fdea330736 [diff] | |
parent | b060f018effb27a79797e55f9eb6a592db2cb39a [diff] |
am b060f018: am 91aa1bdb: am 19847b07: am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev * commit 'b060f018effb27a79797e55f9eb6a592db2cb39a': Remove TrustAgent whitelisting API