| commit | a1d6bc7e49808035cd30e4e4bb07259a8c11748a | [log] [tgz] |
|---|---|---|
| author | Sasha Smundak <asmundak@google.com> | Fri Apr 05 10:31:21 2019 -0700 |
| committer | Sasha Smundak <asmundak@google.com> | Fri Apr 05 10:31:21 2019 -0700 |
| tree | 93e23794ce3831d24f4228415aa265a3972ace03 | |
| parent | a834322fc81d71659a90d230320502812ba2c423 [diff] | |
| parent | ce8563af7fed0e284228103ff73e9534d449e40e [diff] |
resolve merge conflicts of c178021c320a49a2690403d3fca3c213294b27a6 to qt-dev-plus-aosp Bug: None Test: I solemnly swear I tested this conflict resolution. Change-Id: Ie5b9b4b72fdbf482def9c03de5e7f2d86cb570ab