diff options
| author | Geoff Mendal <mendal@google.com> | 2015-02-23 13:55:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-23 13:55:37 +0000 |
| commit | 85f270f69c9e99bf11947744e5b5091bba5e093c (patch) | |
| tree | 8c7f309be6c6cb6fed17837c1ee688d643023360 /tools/aapt2/diff/Diff.cpp | |
| parent | 6001319ae4eaad7ab9112b5c7cbb1659e1ec2e2b (diff) | |
| parent | 1f4e01f2b30e713cfb679fcb81286ba4a2fd7b53 (diff) | |
am 1f4e01f2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '1f4e01f2b30e713cfb679fcb81286ba4a2fd7b53':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions