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>2021-03-31 17:17:15 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-03-31 17:17:15 +0000
commitda177c6ce9312014e04d7d28f04510e5d5699043 (patch)
treea68cd566971eac66afa3b011ce5f08cbff7a1fa9 /tools/aapt2/java/JavaClassGenerator_test.cpp
parenta800579be088fb4a8ddfadaf3d7a0834822c8620 (diff)
parent4808bcc3dcaa8fcac7386b372f3e9904c4c08cd4 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 0374c6150f -s ours am: f210a399a4 -s ours" into sc-dev
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions