| commit | c59116a6772298701881b1ab2c7673d837b74bf4 | [log] [tgz] |
|---|---|---|
| author | Pinyao Ting <pinyaoting@google.com> | Thu Sep 12 15:51:39 2019 -0700 |
| committer | Pinyao Ting <pinyaoting@google.com> | Thu Sep 12 16:04:56 2019 -0700 |
| tree | 8bd26b64e2168cff14f9cbf6566d73e829366c21 | |
| parent | fb553edbee37f11131f6a6b880cf906cefb2a063 [diff] | |
| parent | 8a739f9511cc3833fdd9df33ce35bd6126ba1ea4 [diff] |
resolve merge conflicts of 8a739f9511cc3833fdd9df33ce35bd6126ba1ea4 to ub-launcher3-master Bug: None Change-Id: Ieb5ae70464d4fa964622310c67e0dd4b58660cc3 Test: I solemnly swear I tested this conflict resolution.