summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-07-12 16:29:00 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-07-12 16:29:02 +0000
commit10079e545401f0db8f67364ae5a685e09f0e0d82 (patch)
treebbb9073f5bfe9b67d4f1fbd8f1f4bb831bad5e67 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentfbf5611d315b6301d917306323c8e228666e176d (diff)
parent5cca76e7e662cd0d0e60971ed48fe81f60fb9cf2 (diff)
Merge "Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev am: a8b4e7320a -s ours" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions