| commit | 11e0a4ffa7d3da74a8dc15d5125abc1ecd290d25 | [log] [tgz] |
|---|---|---|
| author | Tony Wickham <twickham@google.com> | Fri Oct 30 11:09:44 2015 -0700 |
| committer | Tony Wickham <twickham@google.com> | Fri Oct 30 11:09:44 2015 -0700 |
| tree | 0517e6c7892f692b6dbcba9458ce2c87e1398b5a | |
| parent | 7bc535b7b9602e28eaab3cc984f58ec109487bb4 [diff] | |
| parent | aa237b1a82dd4536e4576853534b1517c3d14681 [diff] |
resolve merge conflicts of 4530aca912 to ub-launcher3-master. Change-Id: I55a0cd751cbcce8fcc8efa23a0a88a01ec08522b