| commit | a76674f15310cd620b21d88f9d484acf76bb6165 | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Thu Apr 11 19:05:28 2019 +0100 |
| committer | Neil Fuller <nfuller@google.com> | Thu Apr 11 18:09:18 2019 +0000 |
| tree | c2de20f921d93228e4c6fdc866ca07cf091c8dd9 | |
| parent | 7921213793c02f62731a39372a8e55482f852484 [diff] | |
| parent | fe9b32e4bed2737bc5dfe518a201a0c84fb4aa20 [diff] |
resolve merge conflicts of fe9b32e4bed2737bc5dfe518a201a0c84fb4aa20 to qt-dev-plus-aosp Bug: None Test: I solemnly swear I tested this conflict resolution. Exempt-From-Owner-Approval: Merge conflict resolution for approved change Change-Id: I39bda8417f709f86b5b389a75ff34df8a28a3d8d