summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2019-06-24 15:47:22 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-06-24 15:47:22 +0000
commit12258e0a314691f652ac9ee857b5cdb5cab9a594 (patch)
tree0b78bebe76ee6aa49a4d0a242ae926e93dcee449 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent157a81d9051497e45c1943d5ab23d72b01df06c2 (diff)
parent60534a8d17d5b8ad5608f2d96e2183be278f2768 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: c000487154 -s ours am: d1809212c4 -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions