summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorBill Yi <byi@google.com>2017-07-26 08:48:42 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-07-26 08:48:42 +0000
commit3b79465889dd8cda60b67a8843d7c580da480f04 (patch)
treee794a4f17ceace99ed933dcfbe865f8c3e43754a /tools/aapt2/java/JavaClassGenerator_test.cpp
parent7554e6bd35e5d0d90da1beef3ab9542bb512f2a6 (diff)
parent4ca3a013266e48be682ebf708f26f75cf622437a (diff)
Merge "Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: a7f60741ae -s ours am: 799144a18b -s ours" into oc-dr1-dev-plus-aosp am: 8f148cdce4 -s ours" into oc-mr1-dev-plus-aosp
am: 4ca3a01326 -s ours Change-Id: I7b9790b18b43b1983dcf0883d86a0a32d27de51d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions