tree 6000309e49b8319b1760c7bf7934db97ef20ff9a
parent 3c4906949f9d7a978caa5ffe9dfe8e6e153876ef
parent 0e0498031092488ff166145c12ce36cc0a80c490
author Sunny Goyal <sunnygoyal@google.com> 1454528496 -0800
committer Sunny Goyal <sunnygoyal@google.com> 1454528496 -0800

resolve merge conflicts of 0e04980310 to ub-launcher3-calgary.

Change-Id: Ic4526dfc388590aa0288936d827f19060922529f