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-14 05:59:40 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-14 05:59:40 +0000
commitf44efc812982a272b56700de0160a80d0a1739d2 (patch)
tree91811a0ae2fc41f1cfc7b3233c0b6e6906daf5e5 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentc681fec4cabb3321cfb1fa7aacfb65e8a4611e96 (diff)
parent6a07ca544dd3ab06cef06812b664a4f4c0303c2f (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 96860e0ecc -s ours am: 40e01bebc0 -s ours am: 2c2d86ce66 -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions