| commit | fa8c70d3a1b5d4785b3ce36f10dfa8e6ff8d57d3 | [log] [tgz] |
|---|---|---|
| author | Mady Mellor <madym@google.com> | Wed Jul 17 13:44:01 2019 -0700 |
| committer | Mady Mellor <madym@google.com> | Wed Jul 17 13:44:01 2019 -0700 |
| tree | c35353ada7ac22b6c56e269bfe569e8b5ef0e96c | |
| parent | e7571389df9593cc7d6d5507794890321c9d4499 [diff] | |
| parent | 9177ab6ceebc8dca97380fd1f058b1f5b3d7a18c [diff] |
resolve merge conflicts of 9177ab6ceebc8dca97380fd1f058b1f5b3d7a18c to qt-r1-bubbles-dev Bug: None Test: it compiles Change-Id: Icc4d040d07b8093d1fbb80698cac902dfad8ae02