| commit | 304f1c0e90f38e60ceecd63572ed5dafbd6058f9 | [log] [tgz] |
|---|---|---|
| author | Tyler Gunn <tgunn@google.com> | Thu Aug 01 09:35:33 2019 -0700 |
| committer | Tyler Gunn <tgunn@google.com> | Thu Aug 01 09:35:33 2019 -0700 |
| tree | fbb6711dde999489bb5ee453cbd5adb803295678 | |
| parent | 0e71b3357ad93eaef966f7c406907c7aa0bfe7e5 [diff] | |
| parent | ed95429218b507ca4080ad3e14084eb41c03e4db [diff] |
resolve merge conflicts of ed95429218b507ca4080ad3e14084eb41c03e4db to qt-qpr1-dev-plus-aosp Bug: None Test: I solemnly swear I tested this conflict resolution. Change-Id: I8d02276d6d1155fbea6620aba3a9e149e9d4d3f6