| commit | 2b396f4f90eda4be156aa03e0e9998a1f0b76e37 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Thu Aug 01 10:19:58 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 01 10:19:58 2019 -0700 |
| tree | 00e52871d5c241eb0ed71d48bc3e3b65d9b77a0d | |
| parent | 9543bf36a07d6854f20f6f6a437a8d14c9963280 [diff] | |
| parent | 1ec38f85cf8476d3dabe751d445579cf7eab3b9d [diff] |
resolve merge conflicts of 1d0d34348cf8fc21614b2a8e52d5d886d50a55dd to qt-r1-dev-plus-aos am: 1c9d219e15 am: 1ec38f85cf Change-Id: I1c133f674d3c701e6431ceb666ab65829ab6e572