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-18 20:27:39 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-18 20:27:39 +0000
commit77fb838999e45886d54c9a6166c3a60a893c9cc0 (patch)
treea01dfb63e87e88eb448fb0105df5f72de7193e83 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentd13cc53aab0f6a1685ee77b9c114bc1f4c6d957b (diff)
parent1ebd66cf2db9cab529de1e9d0c84988b9edebc83 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 3c26551d2b -s ours am: 94f6045361 -s ours am: c2d85b8205 -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions