| commit | 027e00787a0417665ce0b0bf074c5b1ad83b8076 | [log] [tgz] |
|---|---|---|
| author | Sasha Smundak <[email protected]> | Mon Apr 08 16:13:19 2019 -0700 |
| committer | Sasha Smundak <[email protected]> | Mon Apr 08 16:13:19 2019 -0700 |
| tree | 714316463193d4ea1c2c1bafdbb031d1a5f06765 | |
| parent | a99eea29f3d2a843a6d28daa61bae5cd007bb44b [diff] | |
| parent | 27c9838e0dfce837b6b610552eb0cc366ee457ec [diff] |
resolve merge conflicts of 27c9838e0dfce837b6b610552eb0cc366ee457ec to qt-dev-plus-aosp Bug: None Test: I solemnly swear I tested this conflict resolution. Change-Id: I525046b7edc62aa4fe647eb46545516d214cc2b2