diff options
| author | Geoff Mendal <mendal@google.com> | 2016-02-03 11:19:55 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-02-03 11:19:55 +0000 |
| commit | 4ab87574b3f3b49b707db0aa9db6d68014b52181 (patch) | |
| tree | 78148f4ea7a01b1dc65fa2ac0114409cf1e48c62 /tools/aapt2/diff/Diff.cpp | |
| parent | 8c933ff53d766c3a4c3a5fba0ca74dde759b5c40 (diff) | |
| parent | 3350974f82c7743e204d57f5f19b554e67bdad63 (diff) | |
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 4a27667bf5 -s ours am: b1be124b15 -s ours
am: 3350974f82 -s ours
* commit '3350974f82c7743e204d57f5f19b554e67bdad63':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions