diff options
| author | Baligh Uddin <baligh@google.com> | 2015-09-29 14:33:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-29 14:33:11 +0000 |
| commit | 5b1605a9852e0360af1f723447015f4257daaea2 (patch) | |
| tree | 284abf1b499e7d841792ec98d27f29bf67b0175d /tools/aapt2/diff/Diff.cpp | |
| parent | 8392b394f26ef726a002cd380979058203438dc8 (diff) | |
| parent | 23de74aed5d25152b788e063da8f6a2ed19cd222 (diff) | |
am 23de74ae: (-s ours) am b52e5e38: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit '23de74aed5d25152b788e063da8f6a2ed19cd222':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions