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-18 06:49:42 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-07-18 06:49:42 +0000
commitcd7e79c65520ce2fb1d3cee3c51c0c04ef0a9159 (patch)
treea82c7f97cfa991ca4eb0b8468776b130069702ad /tools/aapt2/java/JavaClassGenerator_test.cpp
parent135e36a20fe3ddb9e7203c0fd12409fcbaae29b4 (diff)
parentece8ed1e51f61c3a346e5f0d6215fb335b0c0247 (diff)
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72d3135ecb -s ours am: 8a673b874f -s ours am: ac342cc50c -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions