summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-12-28 05:41:16 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-12-28 05:41:16 +0000
commit3ab0f694e0a5241c347f5a158683a66a328a415b (patch)
treeb598caa7c900309acdf692d6e4aa450426fc12e9 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent98ff0febf4c93504f07b024aab4645b5ad5548ec (diff)
parentbedfb2faecc4ddc83cf368d0db5c10776236a49b (diff)
am 45c6ae56: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
automerge: bedfb2f -s ours * commit 'bedfb2faecc4ddc83cf368d0db5c10776236a49b': Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions