| commit | fafd4c276e1a1db8449d1feb46800351adbc3ad6 | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Thu Aug 27 16:47:13 2015 -0700 |
| committer | Sunny Goyal <sunnygoyal@google.com> | Thu Aug 27 16:47:13 2015 -0700 |
| tree | 4c89beb37b0a148446976f99abab73172c98ca92 | |
| parent | bcd2874ab9d2b83172a2ea771dea7a285f72a068 [diff] | |
| parent | ebfae6e266590d04702441ed630704c5eb4ccaaa [diff] |
resolved conflicts for merge of ebfae6e2 to ub-launcher3-master Change-Id: I1e0d5f1140e910b68322c4f5061d0a3c383899f0