diff options
author | Baligh Uddin <baligh@google.com> | 2015-09-23 19:51:46 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-23 19:51:46 +0000 |
commit | 89b9f9f5072df4a0eaca3686a643999061e185d0 (patch) | |
tree | c18bdd8357f34650e7a42565929be44d3263cecc /tools/aapt2/diff/Diff.cpp | |
parent | 6f606368fdedfc6e05da1619ccf7ea361b88c989 (diff) | |
parent | 4d1b3fda4343e026b2ec80689f5747744cc86692 (diff) |
am 4d1b3fda: (-s ours) am 1584eefe: (-s ours) am eb1e4b14: (-s ours) am 9c5e49b7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '4d1b3fda4343e026b2ec80689f5747744cc86692':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions