| commit | 7b933a5ef764d4716177dc7f060af823a38fa628 | [log] [tgz] |
|---|---|---|
| author | Winson Chung <winsonc@google.com> | Thu Jun 18 14:26:10 2015 -0700 |
| committer | Winson Chung <winsonc@google.com> | Thu Jun 18 21:27:30 2015 +0000 |
| tree | c8cfbbb455b7ff26e1d48fccea8e148b09fb6fd7 | |
| parent | d3800208aa8c4f5926502ccb8e49e13501b441c9 [diff] | |
| parent | 78564d4e2ddb4f8aba481b6943c155e121b41a7f [diff] |
resolved conflicts for merge of 78564d4e to ub-launcher3-burnaby Change-Id: I9e302b223dff1f238d720026e20b64315b61b293