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