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-05 23:20:30 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-05 23:20:30 +0000
commit9a78c292c9902af7bd24e23c2f100ec016fe6ee4 (patch)
tree8cf0580d0fc28c6db7f4d03b05e49a5e430897ce /tools/aapt2/java/JavaClassGenerator_test.cpp
parentfb7b1afab0755d3f05888a2e36e202c26f1b0f7a (diff)
parent00ae01b3e037f716b8d5bde410f79dc419a713dc (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 80e43d2ed7 -s ours am: 8a9211ecc5 -s ours" into rvc-d1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions