| commit | c91edfc6677061e8c30cbb227f5a5d539bbdee29 | [log] [tgz] |
|---|---|---|
| author | Mikhail Naganov <mnaganov@google.com> | Wed Mar 11 00:55:04 2020 +0000 |
| committer | Mikhail Naganov <mnaganov@google.com> | Wed Mar 11 00:55:08 2020 +0000 |
| tree | 989a064746180bb0ebfeb28494dde26a1305f684 | |
| parent | 15bf0cff2d92410cb41585a6f48d1406075c74f4 [diff] | |
| parent | a0c272439cbae8b232bd5e92e7d5241ae56354b2 [diff] |
resolve merge conflicts of a0c272439cbae8b232bd5e92e7d5241ae56354b2 to qt-qpr1-dev-plus-aosp Change-Id: I16a3a50a39c52384eec75d6576e7a862fa8b8385