| commit | a6631d76a70e495867c14c33c0af6fc779af4149 | [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 | 0f8b72539befb46763cd90344e1b25ba98217bde | |
| parent | c1ff24c0779d40ac5dcadc05ce51b7056a4286bb [diff] | |
| parent | 4530aca912c7b4942d3cbc63fe6997a1615d7b0a [diff] |
resolve merge conflicts of 4530aca912 to ub-launcher3-master. Change-Id: I55a0cd751cbcce8fcc8efa23a0a88a01ec08522b