diff options
| author | Geoff Mendal <mendal@google.com> | 2016-02-03 11:22:48 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-02-03 11:22:48 +0000 |
| commit | 8f8ba83ce953c6757990548610d6318d94188bb3 (patch) | |
| tree | 78148f4ea7a01b1dc65fa2ac0114409cf1e48c62 /tools/aapt2/diff/Diff.cpp | |
| parent | 392ddc670274bb036b799932a4512f858aa91d79 (diff) | |
| parent | 4c3e6f2a53d4815da8fdaf7431bc8091561551a7 (diff) | |
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: c0297abd93 -s ours am: 768b07ca66 -s ours
am: 4c3e6f2a53 -s ours
* commit '4c3e6f2a53d4815da8fdaf7431bc8091561551a7':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions