diff options
author | Geoff Mendal <mendal@google.com> | 2016-02-03 16:40:38 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-02-03 16:40:38 +0000 |
commit | f322b4602893a9cb3eae30ac0f4f196b3dc95176 (patch) | |
tree | 8d5310b1da89a5fa92ce081e6cef6811755f7129 /tools/aapt2/diff/Diff.cpp | |
parent | 04364c74640965e92fb48be2c9ba0f4d75e1f8bf (diff) | |
parent | 8152fbd7e999fe57f85944a12b281be47fec0a79 (diff) |
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: 8152fbd7e9 -s ours
* commit '8152fbd7e999fe57f85944a12b281be47fec0a79':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions