summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-06 14:23:26 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-07-06 14:23:26 +0000
commitb1ee63639f7933f4d6fa40fbfbdcc9f437af582c (patch)
tree4dc1880b8fa57b28ce990067e0049c0f065dcc8c /tools/aapt2/java/JavaClassGenerator_test.cpp
parent44d9cd3f52a6b3317ba64049ea92cd6a99ca5a89 (diff)
parent25b4952da7222e6850f72093309a9924e331ad30 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: cc4a65b365 -s ours am: e861ab7cb2 -s ours am: 4b4922186a -s ours" into rvc-d1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions