| commit | 6982de2485ae516f02758bffd0cb0fdc4b127fef | [log] [tgz] |
|---|---|---|
| author | Tony Wickham <twickham@google.com> | Wed Oct 12 14:38:43 2016 -0700 |
| committer | Tony Wickham <twickham@google.com> | Wed Oct 12 14:38:43 2016 -0700 |
| tree | 8f77e38f38d0b4278bfa370b11b6486f595b741b | |
| parent | 3f0a53fa448fc077a1e3ca547bdd0f3bd408372f [diff] | |
| parent | 2fd020860533e18c64a93d14d11cb2d34bc9cbaf [diff] |
resolve merge conflicts of 2fd0208 to ub-launcher3-master Change-Id: I20ad6eaace81786be080e28d6eb551908add6d90