summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2015-07-15 15:57:39 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-15 15:57:39 +0000
commit1b379b2bf4258aec584884ede52e501cbb142d60 (patch)
treec50dc72c120ed75b87c9a0068127717c93b0572d /tools/aapt2/diff/Diff.cpp
parent91202e5929dbaf5013dd0e641e4c9e98d9d3f256 (diff)
parentb4ac0141b01d98f0d750d9303a670b17e2f76f37 (diff)
am b4ac0141: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'b4ac0141b01d98f0d750d9303a670b17e2f76f37': Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions