summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-10 21:02:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-10 21:02:23 +0000
commit6875f4e5533e3ca1c22b7b9f7c2e1c1324fc36e7 (patch)
treee323bf8c9844d259ec2af71ae7381b1bf5d9c397 /tools/aapt2/java/JavaClassGenerator.cpp
parent27b648d53ff8135a961b6d6d3fe52c51d7aac946 (diff)
parent04efd25c8875fb8987bc275639baa2aa1a97d224 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 14d8e24fef -s ours am: b8a30b14dc -s ours" into rvc-d1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions