tree b244d7b5cf1d0c7e753fb3f6751c4108cd87d0a5
parent 323117ca37483c2adcd14b9969e2a36ea57a9d6a
parent 3826bab27ef3e7608aba112bd0f5ce2e7c3eac5b
author Sunny Goyal <sunnygoyal@google.com> 1455135983 -0800
committer Sunny Goyal <sunnygoyal@google.com> 1455136071 -0800

resolve merge conflicts of 3826bab27e to ub-launcher3-calgary.

Change-Id: I14ff2d67de4ba97628bdf651602724f9f4989173