summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2015-02-25 18:30:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-25 18:30:10 +0000
commit74160d8cdb2d6d63ebb9c904cb6b83271d96555c (patch)
tree31109654ba29b705d0ce8258a4c8bea1c6b45892 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentc718455cc11d9d9441a405ba522359fdea330736 (diff)
parentb060f018effb27a79797e55f9eb6a592db2cb39a (diff)
am b060f018: am 91aa1bdb: am 19847b07: am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
* commit 'b060f018effb27a79797e55f9eb6a592db2cb39a': Remove TrustAgent whitelisting API
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions