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