diff options
| author | Geoff Mendal <mendal@google.com> | 2016-02-03 11:00:08 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-02-03 11:00:08 +0000 |
| commit | 5e978a23d6e543e44b601a53e1d85f3526f8d21a (patch) | |
| tree | 78148f4ea7a01b1dc65fa2ac0114409cf1e48c62 /tools/aapt2/diff/Diff.cpp | |
| parent | 00bd9a11e9f308c7c17c2285de0d7fab237a8716 (diff) | |
| parent | a6f5fe64f4cee0cae193d2a7fea9691bbdfaedb6 (diff) | |
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: 063357312c -s ours am: 4d79bcf457 -s ours
am: a6f5fe64f4 -s ours
* commit 'a6f5fe64f4cee0cae193d2a7fea9691bbdfaedb6':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions