| commit | 521224131ea7a2d52fe58d82079baef5158c3d54 | [log] [tgz] |
|---|---|---|
| author | Tony Wickham <twickham@google.com> | Fri Sep 20 16:22:50 2019 -0700 |
| committer | Tony Wickham <twickham@google.com> | Fri Sep 20 16:22:59 2019 -0700 |
| tree | 857b3d9ec88717d27e4e6c772d4aae7cc30be591 | |
| parent | 912206c17d2ef3402db1f01aabfe36c1bf8e9f2a [diff] | |
| parent | 5c229885fce2c6b0d925c4146892db4139dd3657 [diff] |
resolve merge conflicts of 5c229885fce2c6b0d925c4146892db4139dd3657 to ub-launcher3-qt-future-dev Bug: None Test: I solemnly swear I tested this conflict resolution. Change-Id: I41247ff46308b72158731e4a47466533d42e67c6