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-06-28 02:00:08 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-28 02:00:08 +0000
commit1597e024080ba31c573976259804bd3cd7f3787b (patch)
tree0086bc7f9cfd7055094342ae341610753985d4a1 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentac8af2264f311598ae0f74790695f706036b89b4 (diff)
parent64617c2c049cb0d6d0d6fa4f9d16321f0a4841b1 (diff)
Merge "[automerger skipped] Import translations. DO NOT MERGE am: d6c5d047f0 -s ours am: 558bbb9f8a -s ours am: 09e6b782ee -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions