tree 4c89beb37b0a148446976f99abab73172c98ca92
parent bcd2874ab9d2b83172a2ea771dea7a285f72a068
parent ebfae6e266590d04702441ed630704c5eb4ccaaa
author Sunny Goyal <sunnygoyal@google.com> 1440719233 -0700
committer Sunny Goyal <sunnygoyal@google.com> 1440719233 -0700

resolved conflicts for merge of ebfae6e2 to ub-launcher3-master

Change-Id: I1e0d5f1140e910b68322c4f5061d0a3c383899f0