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-05-23 14:31:10 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-05-23 14:31:10 +0000
commit7463fa4350142bb144d153011702771c7d1ee872 (patch)
treef15244a43a629a169fe656d4815c229fcf9e0b39 /tools/aapt2/java/JavaClassGenerator_test.cpp
parenta9edf37d1a6bf91bb3192b6873c17fb5523dbdf1 (diff)
parent9edbf96bc1f8800a5df0098c14463df20d31992a (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 53392bb2a6 -s ours am: 04fc956d34 -s ours am: 97d78fea5d -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions