diff options
author | Baligh Uddin <baligh@google.com> | 2015-09-23 19:51:24 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-23 19:51:24 +0000 |
commit | b39d6033b134ff86e8add2f24945b0060144f053 (patch) | |
tree | c18bdd8357f34650e7a42565929be44d3263cecc /tools/aapt2/diff/Diff.cpp | |
parent | b0ad825f538eea9d05380dbb21949cfb300ed47d (diff) | |
parent | c8d2fa3c2e8d957cf84ef543a2bcd3d9778cc0e3 (diff) |
am c8d2fa3c: (-s ours) am 43c9b3ee: (-s ours) am a58143b4: (-s ours) am a6928d4d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'c8d2fa3c2e8d957cf84ef543a2bcd3d9778cc0e3':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions