diff options
| author | Geoff Mendal <mendal@google.com> | 2015-02-12 23:25:38 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-02-12 23:25:38 +0000 |
| commit | 1da54032e8778e5357fbb9f387ba9000cce8d7b3 (patch) | |
| tree | 13d10d922795b545f5124524ed78967990367c62 /tools/aapt2/diff/Diff.cpp | |
| parent | cacf90e51517f8fab137a62f11bf16191c2c8825 (diff) | |
| parent | 6c02d9239885a529d4b160aa3938b14c61fbc3fd (diff) | |
am 77c5de0d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
automerge: 6c02d92 -s ours
* commit '6c02d9239885a529d4b160aa3938b14c61fbc3fd':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions