summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorCasey Dahlin <sadmac@google.com>2015-09-02 23:29:19 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-02 23:29:19 +0000
commit626ba0c263a5ae9983b2704a3e82c216b39387f0 (patch)
treeac00607b0847a4357bda2c3a3db1611aa9e15755 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentbe3b06766a1ed0e8cecb78c98f08dc2c2703a6d8 (diff)
parent1be040fb7d849762bf31bf9f898a4a004015aeb1 (diff)
am 1be040fb: am b15623cf: resolved conflicts for merge of 9483748a to stage-aosp-master
* commit '1be040fb7d849762bf31bf9f898a4a004015aeb1': Delete outdated options tests
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions