diff options
| author | Geoff Mendal <mendal@google.com> | 2016-02-03 10:54:21 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-02-03 10:54:21 +0000 |
| commit | eab6e31f60c09483dfbf826992c622f5c7e75147 (patch) | |
| tree | 78148f4ea7a01b1dc65fa2ac0114409cf1e48c62 /tools/aapt2/diff/Diff.cpp | |
| parent | ef47878192451d8ae65caa8b479a088c49fbe9d3 (diff) | |
| parent | b8783e59338a49eb160f6e7b66d10dc5b2b57b84 (diff) | |
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 3122eedcd3 -s ours am: aa7e0396c9 -s ours
am: b8783e5933 -s ours
* commit 'b8783e59338a49eb160f6e7b66d10dc5b2b57b84':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions