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 23:31:12 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-01-25 23:31:12 +0000
commit508e3d6db7e9a294ab9ff785e9e39b4f38e0be3f (patch)
treecddcc3e030137a8f1fd5e16a339b31f34fade1bd /tools/aapt2/java/JavaClassGenerator_test.cpp
parent0618d2da3253370c4b0e42280f509cce263f29a4 (diff)
parent3a09b4e748b80ac2ae4dcb52539d8d27526f1614 (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 am: dbbffc9bd6 -s ours
am: 3a09b4e748 -s ours Change-Id: I709ad494550215037ca532d902c2935c7f22efb1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions