| commit | 1df1226927963643dca1df19e49631d051de1acc | [log] [tgz] |
|---|---|---|
| author | Youming Ye <paulye@google.com> | Tue Apr 23 10:51:08 2019 -0700 |
| committer | Youming Ye <paulye@google.com> | Tue Apr 23 10:51:12 2019 -0700 |
| tree | 52cbb10399c177525529a95747430c6b876fd466 | |
| parent | 953b634c35bb2e8bfa141ddc1d69316ba56cb4e1 [diff] | |
| parent | 34cfdfa7137298915be923a8fa6047d4d1b04141 [diff] |
resolve merge conflicts of 34cfdfa7137298915be923a8fa6047d4d1b04141 to qt-dev-plus-aosp Bug: None Test: I solemnly swear I tested this conflict resolution. Change-Id: I2c97ec0d2bcf7d94e4627b4bc6015e91ed6a9431