| commit | b7484f9381a63144f8359b59863493cd469ba417 | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Thu May 25 10:05:45 2017 -0700 |
| committer | Sunny Goyal <sunnygoyal@google.com> | Thu May 25 10:05:45 2017 -0700 |
| tree | 03f49d106c24a2774be4e78966bd2bd8a2c9f85e | |
| parent | fc7c52ecc3ae2ec90dba29078ef35499e2cfa387 [diff] | |
| parent | 9d9dbcb1b80017f547b07bcd80de79a298bd80f6 [diff] |
resolve merge conflicts of 9d9dbcb1b to ub-launcher3-master Test: I solemnly swear I tested this conflict resolution. Change-Id: I9978124fb3c24bb497cac0d199c0b5dcdc670715