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-06 14:22:28 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-07-06 14:22:28 +0000
commitd289316fbfdffbef4a37365cdadcdf4ff4224a47 (patch)
tree4dc1880b8fa57b28ce990067e0049c0f065dcc8c /tools/aapt2/java/JavaClassGenerator_test.cpp
parentf4ca0c379ba38ae7936322a74defbc74d819292f (diff)
parentbfab14df16444f92fb6c01195a9ce0ec3e2627eb (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: ac0b376dde -s ours am: 5bc71ea527 -s ours am: 4414d61052 -s ours" into rvc-d1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions