tree 6b34fa89c9c5b2f105ecb84b2e11dc1e0371efb6
parent ed3563a279ea270ae70d3be115b676e0363eb052
parent 7bce5f7988d63e6f64db4b8482f781cc63820246
author Sunny Goyal <sunnygoyal@google.com> 1448399552 -0800
committer Sunny Goyal <sunnygoyal@google.com> 1448399552 -0800

resolve merge conflicts of 7bce5f7988 to ub-launcher3-master.

Change-Id: Id352ce219bed7701956bb462ea2dd0a5aebe7317