| commit | 9c96d7f7bb8ab43e8bb80c349ff1fb39e8cad5c6 | [log] [tgz] |
|---|---|---|
| author | Pavel Grafov <pgrafov@google.com> | Mon Jan 27 16:10:32 2020 +0000 |
| committer | Pavel Grafov <pgrafov@google.com> | Tue Jan 28 11:35:59 2020 +0000 |
| tree | 775f6c66fde2c62541f54a77ccc4ff02783e7d82 | |
| parent | 14488c053949c745add536cbfd8054976dcb5f03 [diff] | |
| parent | 0d29fccf131aa915006d9971e1cedc9db0131251 [diff] |
resolve merge conflicts of 0d29fccf131aa915006d9971e1cedc9db0131251 to qt-dev Bug: 146081599 Test: I solemnly swear I tested this conflict resolution. Change-Id: If327d91616a10e730fb6bbfbad3acbe4997051a0 Merged-In: Ief360ea184e621961cbcfe4e29e6f590b5509b36