| commit | aff1a1df8a09ff89f762c5d9915597219c022dae | [log] [tgz] |
|---|---|---|
| author | Tony Wickham <twickham@google.com> | Fri Dec 18 14:10:34 2015 -0800 |
| committer | Tony Wickham <twickham@google.com> | Fri Dec 18 14:10:34 2015 -0800 |
| tree | 96795f18c718ac68e3990d2e27edba5a1ed5698b | |
| parent | 13f682f74ec46bd07358d51a52e064fd6221f0fb [diff] | |
| parent | ca656e3c69266234486c6669fc63244330cb0549 [diff] |
resolve merge conflicts of ca656e3c69 to ub-launcher3-master. Change-Id: Idbbf8caa041b2498b3a0a9d1a8f23bf163181972