summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2018-01-25 22:28:28 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-01-25 22:28:28 +0000
commitdbbffc9bd6397f41129e98e91b697f3491b38222 (patch)
tree2bb70f0ae28288f7d2c3d2ed5e9a39a89de36562 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentabad95933a4a3bbd6a9cdbc2b5473ba2457bc139 (diff)
parentdbdfba9546ec113ca5048f4d52ead2e95bc6fe8c (diff)
Merge "Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1d77757fb5 -s ours" into nyc-mr2-dev am: a22445abae -s ours" into oc-dev
am: dbdfba9546 -s ours Change-Id: Ia18ac187b0f64f03f0327b651b7befd7dd41d3c9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions