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-03 21:47:56 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-07-03 21:47:56 +0000
commit06396946ec6bb437edb761d205deb2d39d4fe6ea (patch)
tree3905411e667d2ff53356e06be0d975bfd0957e9d /tools/aapt2/java/JavaClassGenerator_test.cpp
parentc9c98af455be6a14b9cdc4a32915b157fbcdf041 (diff)
parent2777ebd533da2031236e3c30ec8d2ea16ab0ff9f (diff)
Merge "[automerger skipped] Import translations. DO NOT MERGE am: 2c03529ef3 -s ours am: a3f75d5f4b -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions