tree 9d2bed02cc699b02d5b24ca983a1e2d3e577fa79
parent 3169e9c331d16f622838093743fc20f8f2f4500d
parent 2494c3f1681e71af06556ef47de16f018811f7e3
author Sunny Goyal <sunnygoyal@google.com> 1457041942 -0800
committer Sunny Goyal <sunnygoyal@google.com> 1457041942 -0800

resolve merge conflicts of 2494c3f168 to ub-launcher3-calgary

Change-Id: I807016057da9b867ebb2c8f3ee2027a3a2688d30