| commit | b3a8f80e2ea8de4fb305d7a4141980bc98d629a8 | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Fri Jan 23 14:22:07 2015 -0800 |
| committer | Sunny Goyal <sunnygoyal@google.com> | Fri Jan 23 14:22:07 2015 -0800 |
| tree | 11df4cdd916e56f14e4dec224036a272f25d5bb9 | |
| parent | 1660da5a03b059900baab44ee76626ba6e209561 [diff] | |
| parent | b564efb0244adf0fb8429940f9f716938c62a7ac [diff] |
resolved conflicts for merge of b564efb0 to ub-launcher3-master Change-Id: I4321522dd1b6b3f96e21232d113fad5144b630bc