summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-15 17:35:02 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-07-15 17:35:02 +0000
commit84b059a75daf829eb78ac18d2b9d9fb677fe0a04 (patch)
treeb3022ebcf6448684f827ec39f1be0ea5de6505b0 /tools/aapt2/java/JavaClassGenerator.cpp
parentfba2b3264fc8ee609725e1049699314f4c2c5edc (diff)
parent2d03b096e5232c4d65b496f5e916e803274ba03f (diff)
Merge "Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: e23bf50171 -s ours am: d00097533f -s ours" into rvc-qpr-dev-plus-aosp am: 1888f7c50d -s ours"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions