tree a1fdb3c8a6b98a881315764c898447c21b4cdfbb
parent 385b6e2c49e28b49074a3662dce990a95b7c1604
parent e5ef3d2e9bb221bfb5987edb22a3e811f635b48c
author Sunny Goyal <sunnygoyal@google.com> 1449798372 -0800
committer Sunny Goyal <sunnygoyal@google.com> 1449798372 -0800

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

Change-Id: I37cbbe4f51cc0a8de8071434020ec1553241da85