tree 6747b979740797a3260091bfe7d5b0bedf03ab90
parent 3c0adb0729c0e8a63f745bdbe34448d358f21de8
parent b56090af3546b268b92fab7aca96c267b223db5a
author Sunny Goyal <sunnygoyal@google.com> 1453237208 -0800
committer Sunny Goyal <sunnygoyal@google.com> 1453237280 -0800

resolve merge conflicts of b56090af35 to ub-launcher3-master.

Change-Id: I2ef9a25b70815efe37109004517a7c3077ffa22e