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-05-24 06:17:39 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-05-24 06:17:39 +0000
commit56ce45a0a08ab83ec7e9727c96c88d1f3f48190b (patch)
treef15244a43a629a169fe656d4815c229fcf9e0b39 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent2b50df15eafb2e3fcf9c94b2d3d444b1557cd76d (diff)
parent3f1ac8dfd23b5cc920a7e413ce13ebecf9c16b2b (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 2b11e46457 -s ours am: 628576af1b -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions