diff options
| author | Baligh Uddin <baligh@google.com> | 2015-09-23 19:51:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-23 19:51:39 +0000 |
| commit | 6f606368fdedfc6e05da1619ccf7ea361b88c989 (patch) | |
| tree | c18bdd8357f34650e7a42565929be44d3263cecc /tools/aapt2/diff/Diff.cpp | |
| parent | c0a69ad06031d03fff828d44dbf0902d983f8c70 (diff) | |
| parent | 0882771d196468efad1e5350d0ba163c11e20b92 (diff) | |
am 0882771d: (-s ours) am b89ac616: (-s ours) am 981c592d: (-s ours) am 18daf48f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '0882771d196468efad1e5350d0ba163c11e20b92':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions