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-17 17:12:04 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-17 17:12:04 +0000
commit51322aa3376e2a91803442fda1f9b193779ab1a8 (patch)
tree71e1a4d9f8b278f60c595ad63e47d80555b97302 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentdccd246d898be82c049f9b4604d9e0d3747628d9 (diff)
parentfb910cd8393a715445e15256fbf24a728453bd0a (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 11e5fdf1ee -s ours am: 122dda0e61 -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions