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