summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2015-07-09 13:36:26 -0700
committerBart Sears <bsears@google.com>2015-07-09 22:21:50 +0000
commit9c22afe8538cd8c849d0393751bf5bc4997bc632 (patch)
treeca36b183fa7fc30abafcd8058877eae9e34d8bea /tools/aapt2/java/JavaClassGenerator_test.cpp
parentf19abb67c2604c06b140979cb527c599c37d02f4 (diff)
Fix a bad merge.
Change-Id: Ib722459a25c189bb800eb85d48b80bdc91a2b7db (cherry picked from commit 2a67840c3c35a6267663e5d3ae921ee9ac614db9)
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions