tree 3439a89b0545deb78bb62ff63131dca249531d37
parent ccf3a9ed56a46b665a5aba6a5e0396ac07f79e68
parent 6362683acb884ec72fe10f1cf394d178d3918a96
author Sunny Goyal <sunnygoyal@google.com> 1453942550 -0800
committer Sunny Goyal <sunnygoyal@google.com> 1453942550 -0800

resolve merge conflicts of 6362683acb to ub-launcher3-calgary.

Change-Id: Id48bf33912bf927121356a08b8501ee0070bfdc7