tree 9fd44dbc0d2d626e29df8a0a630fe69cb7526deb
parent 22ed889f877f2feee09698c726b515c7d66c5a1a
parent 2517f887951b2d02294c6f20a4d22ca71314bdba
author Sunny Goyal <sunnygoyal@google.com> 1431466877 -0700
committer Sunny Goyal <sunnygoyal@google.com> 1431466877 -0700

resolved conflicts for merge of 2517f887 to ub-launcher3-master

Change-Id: I4848774da89811dc173a475cb1d958add6d2bfd0