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-18 06:30:53 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-07-18 06:30:53 +0000
commit3e14f4892eac7898d183e683b46eec81be701d80 (patch)
tree504415d7396ffaa034de4ce3eb4a7764a9a97930 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent3c4274e79b6f53a1bf3576373314144438fdf3f9 (diff)
parent4de185f8b2c4f2d7e8755d9851741a77907935e5 (diff)
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72d3135ecb -s ours am: e4a4b7dbee -s ours" into rvc-d1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions