| commit | 06792000312d30791235ae2dfcb71d3fdc83b4b2 | [log] [tgz] |
|---|---|---|
| author | Mady Mellor <madym@google.com> | Tue Aug 13 14:33:24 2019 -0700 |
| committer | Mady Mellor <madym@google.com> | Tue Aug 13 14:37:42 2019 -0700 |
| tree | 0b3406209ebc0d31f4e3256612c2648b7429f3d0 | |
| parent | 273632ff4e3707bad875cdb6f9c8fb1d53ceb230 [diff] | |
| parent | 85224a58345a8817e679650de4866993fc10fe7e [diff] |
resolve merge conflicts of 85224a58345a8817e679650de4866993fc10fe7e to qt-r1-bubbles-dev Bug: None Test: I solemnly swear I tested this conflict resolution. Change-Id: If4dbef9cacbcbd8ee5f8c4539a687e4ed754ddff