| commit | 95139bfa6c8a64a568a5700d6d254db6294b35d6 | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Tue May 12 14:41:17 2015 -0700 |
| committer | Sunny Goyal <sunnygoyal@google.com> | Tue May 12 14:41:17 2015 -0700 |
| tree | 9fd44dbc0d2d626e29df8a0a630fe69cb7526deb | |
| parent | 22ed889f877f2feee09698c726b515c7d66c5a1a [diff] | |
| parent | 2517f887951b2d02294c6f20a4d22ca71314bdba [diff] |
resolved conflicts for merge of 2517f887 to ub-launcher3-master Change-Id: I4848774da89811dc173a475cb1d958add6d2bfd0