tree 006db9005dd42d767edfced129550b37d7e87690
parent 258797318a99eb1ad4019f9863c69e34ef47a1ff
parent a50a419b824c10f11d12097215982c978f740e00
author Sunny Goyal <sunnygoyal@google.com> 1449872296 -0800
committer Sunny Goyal <sunnygoyal@google.com> 1449872296 -0800

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

Change-Id: Ie0e233e22284b8ddd2dbb86204e042651b6dfae2