tree acc07c9d058ca0ea03f20dae4db5bc99a958b2db
parent bea3a6ba7e7abd2460216459b4690fa6f5e6c4b3
parent 8eb0de133154666cd20d0244953ee755b626b44a
author Jon Miranda <jonmiranda@google.com> 1490728453 -0700
committer Jon Miranda <jonmiranda@google.com> 1490728453 -0700

Resolve merge conflicts of 8eb0de133 to ub-launcher3-master

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