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-11 21:54:07 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-11 21:54:07 +0000
commit0babada55ae441ee001d0acfc6948f137b46d8d3 (patch)
treeadd592aeabf91a20f8622ce67733195c31f86712 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentddf7bf1280d739919e0b9bc22e38be053e68bdc2 (diff)
parentf68b28e3e42d79f10825ed670aee9c5231b128d7 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: e53f6ddd8f -s ours am: fd90ba695c -s ours am: f68b28e3e4 -s ours
am skip reason: subject contains skip directive Change-Id: I0d09343e28d0bef9e58fc3be0c01a2f6b175c641
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions