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