| commit | 8f531dd9883443265afba8b94db62e78ce02ca57 | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Tue Aug 25 17:08:57 2015 -0700 |
| committer | Sunny Goyal <sunnygoyal@google.com> | Tue Aug 25 17:08:57 2015 -0700 |
| tree | 1048b7ce8f5f81b1f2054e21928146bc47449dbc | |
| parent | 0e31c31de77d2a4ab6db530bb91afb3355e7a8bf [diff] | |
| parent | 20884fdc8d08129618e77ef08a1e85c42af88413 [diff] |
resolved conflicts for merge of 20884fdc to ub-launcher3-master Change-Id: I31b49ed83bf6fa966ad68b587e6fa472e87bc0e3