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-07-16 08:49:44 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-07-16 08:49:44 +0000
commit3bbe410fd48352afc6f3aa2e2a8e33b2364e30b5 (patch)
tree209d522f331adb96e4a2ac52e6fe5f7bcb6ed32f /tools/aapt2/java/JavaClassGenerator_test.cpp
parentcd2995cc7b1645d32836b646013d92207eaff1d4 (diff)
parent47a4cd12061289446b88b2b6e6cc109d0e25eb0d (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 345a4d331f -s ours am: 47b34e44c3 -s ours am: 56a36854c2 -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions