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-01 20:58:39 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-01 20:58:39 +0000
commit7469bbce8e7240617112d07b87945a0f71e351f9 (patch)
tree1b4436fb2923b44efc787ce3696ced48695333ff /tools/aapt2/java/JavaClassGenerator_test.cpp
parent205a9596f0aac152db1b18fd0b127f6c892b4352 (diff)
parent371e8d9292ad99c688f193b1d2ba5fb6c1a7f35c (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 911eb7a414 -s ours am: 2dc9a569df -s ours am: 371e8d9292 -s ours
am skip reason: subject contains skip directive Change-Id: I3d5faad3aedb7fe2ece4674c8eb8c3f51833bccd
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions