| commit | 3d57a0157f635fe6857bbc2eb42787005f1f4a5e | [log] [tgz] |
|---|---|---|
| author | Sudheer Shanka <sudheersai@google.com> | Thu May 09 15:59:09 2019 -0700 |
| committer | Sudheer Shanka <sudheersai@google.com> | Fri May 10 00:36:21 2019 +0000 |
| tree | 822d6091a205be6d679b2e774fd9efb37981c9e7 | |
| parent | fcc06eec09d1913884d32a265cd06a4717b77f8a [diff] | |
| parent | 803c05281620fdb74af6d4b6dd8febe5ac079e1d [diff] |
resolve merge conflicts of 803c05281620fdb74af6d4b6dd8febe5ac079e1d to qt-dev-plus-aosp Bug: None Test: I solemnly swear I tested this conflict resolution. Change-Id: I6c435c2e8443cd7bf5959bfbdfb05f188308d524 Merged-In: Ib8a10d3a9097c1dc4132a71782d622e9e3c3747d