commit | 08fc71e3ee67abd4a380920bf42547c9b4c8de55 | [log] [tgz] |
---|---|---|
author | Tony Wickham <twickham@google.com> | Wed Oct 21 14:41:25 2015 -0700 |
committer | Tony Wickham <twickham@google.com> | Wed Oct 21 14:41:25 2015 -0700 |
tree | 14671b393f662d395c2e2a3b3f3fdd6dd6741856 | |
parent | db72d07313158abaebec1f688e39cdf550540e41 [diff] | |
parent | d8fbf6b0404846ea043c1468e4d8069c62381011 [diff] |
resolve merge conflicts of d5d7fa10af to ub-launcher3-master. Change-Id: I324b1a9cd3c6dce1d5d3b14d3ef95f798e5bc243