diff options
| author | Geoff Mendal <mendal@google.com> | 2015-08-06 04:50:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-06 04:50:00 +0000 |
| commit | 2dbd0c7e5352a5d2bfa41fce6b97ed874a84b5bc (patch) | |
| tree | cb3ebf55f845009afc1f26f53e82a9de29de2d03 /tools/aapt2/diff/Diff.cpp | |
| parent | ca2227811cc614f1ad161dda1879c485bb0c9e4c (diff) | |
| parent | b84d6605f8bfd7818e133e3289ee223ca36a4d9d (diff) | |
am b84d6605: (-s ours) am ecbd1cef: (-s ours) am 511cf5b8: (-s ours) am 227d704f: (-s ours) am 375c792c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'b84d6605f8bfd7818e133e3289ee223ca36a4d9d':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions