summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorKris Giesing <kgiesing@google.com>2015-04-22 17:18:28 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-22 17:18:28 +0000
commit6ea4f9361e644e371c2f49454d2832c451648ebd (patch)
tree1446c931d3be17ef68fdcc19239cffefa7d65afe /tools/aapt2/java/JavaClassGenerator_test.cpp
parent2a0c4a3ae091c4a922a1dec040a56c2edcc5e588 (diff)
parent0ab9655ae1a84d1f4dd79c964b655555cf684bbd (diff)
am 0ab9655a: (-s ours) Merge "DO NOT MERGE Revert "Load libraries directly from apk"" into lmp-mr1-ub-docs
* commit '0ab9655ae1a84d1f4dd79c964b655555cf684bbd': DO NOT MERGE Revert "Load libraries directly from apk"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions