diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-14 17:16:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-14 17:16:57 +0000 |
| commit | 31e075afc951c755a77ed283d3dd3b3f2b41ce2b (patch) | |
| tree | a16611379680c175ae4563cfe05c887faab8dcb9 /tools/aapt2/diff/Diff.cpp | |
| parent | 682217b4e542314c5d7b81c1cd9c939528d29f03 (diff) | |
| parent | d134ad38758d16b0a5ab409a02ef3203e77711f0 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: d134ad3875 -s ours
am skip reason: subject contains skip directive
Change-Id: I0ab18abcf9563b72ddcb61009d0cdf3cdaed3451
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions