diff options
| author | Jim Miller <jaggies@google.com> | 2015-02-25 18:17:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-25 18:17:13 +0000 |
| commit | 91aa1bdb57a82b59401afd88aaeb429ea4c73bac (patch) | |
| tree | 638a2051106f7cbb7970a4605d95be360abb7f46 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 6715b9dda1ada0a71ddc8215bc9c050c76fb309d (diff) | |
| parent | 19847b07e81b9b29e3574ce6ab8acf7a958a1a63 (diff) | |
am 19847b07: am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
* commit '19847b07e81b9b29e3574ce6ab8acf7a958a1a63':
Remove TrustAgent whitelisting API
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions