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-02-12 02:00:50 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-12 02:00:50 +0000
commitcc9e0dc4ee0673956824173899408404e5f76bfd (patch)
tree585b82b3cf2f9fc27e2b64e78a1e975a333381a2 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent07e850a979f74522ae16fc90a0eadfbde3a5c6fe (diff)
parentb58a50b13054f3f30d854bb88f080739b9d32a89 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 805865c314 -s ours am: c6199ca4d8 -s ours am: b58a50b130 -s ours
am skip reason: subject contains skip directive Change-Id: I0697d1b2a5fb540dfac83ed3fd18e0486508c54b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions