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-21 08:55:32 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-21 08:55:32 +0000
commit87d81ffd2163f2d38521c7013ec2c4d27275da13 (patch)
tree58fbabf65039e97889bc8fb11492019a3e8a696f /tools/aapt2/java/JavaClassGenerator_test.cpp
parenta795247dc4c3e6335b2f8b7a1d6ca6e2cc37dbd1 (diff)
parent705a556e303ed5650cc728aaf777b7003f64cc7e (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 88e90b0c16 -s ours am: e792819996 -s ours am: 63e0ade351 -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions