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-19 19:37:25 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-07-19 19:37:25 +0000
commit1c285d0e368dbd860cc3faa1ab375d215f3eca8f (patch)
tree274d4692a038259d849da4d86f1ede1a4a8b0916 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent78c13045f07d221f22c56710ebd72b85c0be6841 (diff)
parent405048412eee63c3cec5859353535fff61da1d5c (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: c294687770 -s ours am: fdd9fab0be -s ours am: a0315ad1a5 -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions