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:48:26 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-06-24 15:48:26 +0000
commit49377c15f06f0dd12e5a2fe31b8887c667ec243f (patch)
tree0b78bebe76ee6aa49a4d0a242ae926e93dcee449 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent18c98d52b6e12191e80ecd806a44159f72b7818d (diff)
parenta210d428f38c80fe163ab4ecb2cda701be09d553 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: cc13f9ed66 -s ours am: 4c20c8c114 -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