tree 586813ef511464771cb80f63557b2fc2e427b22d
parent 5756900508177f6be1c1e9c1111d785a1e575a4d
parent 40dfa3bf6ebe96d28223342fe50b9cb4d37edb2d
author Sunny Goyal <sunnygoyal@google.com> 1490636452 -0700
committer Sunny Goyal <sunnygoyal@google.com> 1490636452 -0700

resolve merge conflicts of 40dfa3bf6 to ub-launcher3-master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Iee500631827ebc48c63c203fdcd0de888adcb135