summaryrefslogtreecommitdiff
path: root/tools/aapt2/diff/Diff.cpp
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2015-06-15 16:27:19 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-15 16:27:19 +0000
commit316548e34476ef75c3ccf8a01366b292927122b6 (patch)
tree1def158efc4487b3fd05239ec99393930895e61e /tools/aapt2/diff/Diff.cpp
parentfa04b7c2798dbb623e9b5e20796ce413feafacfc (diff)
parent40f7418d812200b54fd57459b4b6b317850c1734 (diff)
am 40f7418d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '40f7418d812200b54fd57459b4b6b317850c1734': Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions