tree 03f49d106c24a2774be4e78966bd2bd8a2c9f85e
parent fc7c52ecc3ae2ec90dba29078ef35499e2cfa387
parent 9d9dbcb1b80017f547b07bcd80de79a298bd80f6
author Sunny Goyal <sunnygoyal@google.com> 1495731945 -0700
committer Sunny Goyal <sunnygoyal@google.com> 1495731945 -0700

resolve merge conflicts of 9d9dbcb1b to ub-launcher3-master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I9978124fb3c24bb497cac0d199c0b5dcdc670715