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-06-29 09:07:04 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-29 09:07:04 +0000
commit8960307ee44f3cd79eea4838bb60ab67fbaf5626 (patch)
tree927ddc20a4f171f9cd6146a9b5cab54361bfa2d8 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentec9ab70789401821e6fc18ef26e016476ee04966 (diff)
parentc76d5b2132c02d65755eb6644421ad920e17d015 (diff)
Merge "Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 64aef342c9 -s ours am: a957158cc7 -s ours" into rvc-d1-dev-plus-aosp am: a60c18f443 -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions