summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorBill Yi <byi@google.com>2016-06-20 19:22:44 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-20 19:22:44 +0000
commit9141692247b919e2b8ea6ae56dc592a24f0c1238 (patch)
tree8ef2e9d1556feefce766e02bb4cf25a5d770e50e /tools/aapt2/java/JavaClassGenerator_test.cpp
parentfbcadc61613c4a138bd2112b5ff58b77f8ce578f (diff)
parent293fd9dc20707809d6335f63441fd825d3a5f8dd (diff)
Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: f5314e3b75 -s ours am: 59d0470a64 -s ours
am: 293fd9dc20 -s ours Change-Id: I8e72e110f519eacfd7c2a7216970fdab740fbb7a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions