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-01-29 19:38:52 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-01-29 19:38:52 +0000
commit7e22de9e62b9d072b16de3862e02d7d244da31ca (patch)
tree258fc60da162ae03ddaf4adbb71c41a2be57fd05 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent048f18e6ad3c306052e0aab6af28a5a76d49ff99 (diff)
parent61719eca99b8c12ec8241d92b65c68a13c3fe40d (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 61719eca99 -s ours
am skip reason: subject contains skip directive Change-Id: Id6ee6cbd694ccc6394d79bef0da53984b9055fc0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions