diff options
| author | Bill Yi <byi@google.com> | 2019-04-17 17:28:41 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-04-17 17:28:41 -0700 |
| commit | 7839bc0f3e285a4ec7dd0fc75eec6d8194fa4771 (patch) | |
| tree | 1dc38dbbbab74b7069fd35c0dc5c4b6e517139fa /tools/aapt2/diff/Diff.cpp | |
| parent | d514575d5991d7642401757de08d3b616b44998b (diff) | |
| parent | 0b2b17fbd7c28e7caaba2202bb7276d05f15f9c2 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 0b2b17fbd7 -s ours
am skip reason: subject contains skip directive
Change-Id: Idee2ee75ce3dc2fa1adf11169c99818a84e1e7ce
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions