diff options
| author | Geoff Mendal <mendal@google.com> | 2015-08-06 04:42:31 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-06 04:42:31 +0000 |
| commit | b84d6605f8bfd7818e133e3289ee223ca36a4d9d (patch) | |
| tree | ceb15f05ee025f8cd76ce14dc48c4288d3b5f46b /tools/aapt2/diff/Diff.cpp | |
| parent | 7aafd7faacf0e31dbfc4931c137d0bad8862df87 (diff) | |
| parent | ecbd1cef9cf884f5d34ea36baa1c1496a48751ec (diff) | |
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 'ecbd1cef9cf884f5d34ea36baa1c1496a48751ec':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions