tree 96795f18c718ac68e3990d2e27edba5a1ed5698b
parent 13f682f74ec46bd07358d51a52e064fd6221f0fb
parent ca656e3c69266234486c6669fc63244330cb0549
author Tony Wickham <twickham@google.com> 1450476634 -0800
committer Tony Wickham <twickham@google.com> 1450476634 -0800

resolve merge conflicts of ca656e3c69 to ub-launcher3-master.

Change-Id: Idbbf8caa041b2498b3a0a9d1a8f23bf163181972