| commit | 6b1b687636986bcaf21821d083df0ba9dea40082 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Jun 02 06:59:25 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Sun Jun 02 06:59:25 2019 -0700 |
| tree | 0c35d8e4669b7c86821a5b32af7c5ebc644e229e | |
| parent | 5e7ef56a33680984a916e9b3e29a318743b89888 [diff] | |
| parent | 1724a20e14a11f964dc922cdaef2646302961cd1 [diff] |
resolve merge conflicts of aef843f97038df818be789ae3b7fa671920c2fa0 to qt-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. BUG: 133225687 am: 0beb862ba0 am: 1724a20e14 Change-Id: I1292fb211ba0af18fc0790d82a1ce7be77d1865f