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-19 15:16:18 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-07-19 15:16:18 +0000
commit3f99ca4f24583c8c7a74665e9f2539b08f5b21f9 (patch)
treee2cf66d8dc19db5ab5cf491ea56c8962a598201f /tools/aapt2/java/JavaClassGenerator_test.cpp
parent361164f977e37b74e7f70e5cb184354d75b54b2d (diff)
parentcdf6d64f0a81f1fd40c05b2d33df4fe57e84ee02 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: f6d4adeef4 -s ours am: 75f9d330db -s ours" into rvc-d1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions