diff options
| author | Bill Yi <byi@google.com> | 2019-08-09 10:41:50 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-09 10:41:50 -0700 |
| commit | 4c6117805e52d8afc97ba02d3c460d69c3632135 (patch) | |
| tree | c6d7b2f744508812c1baefc8d44cf34517290a21 /tools/aapt2/diff/Diff.cpp | |
| parent | 99a06dbb3d3bcdb6c7601eaf664a3ec873ef1312 (diff) | |
| parent | 2573e061e68ef37168eebb29a3d7a6a0568d6987 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: c7a7eaa776 -s ours am: b3c1bb04b8 -s ours
am: 2573e061e6 -s ours
am skip reason: subject contains skip directive
Change-Id: I92dfda21f7492f4ed45765868b5d8d2fd66e7abf
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions