summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-05-13 03:40:06 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-13 03:40:06 +0000
commit9233135137082859745ff14d877ff54783338445 (patch)
tree07afcce9dbb9d9fc514d42d07a37ce2b805050af /tools/aapt2/diff/Diff.cpp
parent4d853c51717f7e9a7987ec3c2a8d8ad0fcc7887d (diff)
parent245a775d0df86849d1fec14531dc3fbc0ea25b50 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a24033d8aa -s ours am: 245a775d0d -s ours
am skip reason: subject contains skip directive Change-Id: I5d021ca0209a477e13194b9597591012e9753451
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions