tree 8f77e38f38d0b4278bfa370b11b6486f595b741b
parent 3f0a53fa448fc077a1e3ca547bdd0f3bd408372f
parent 2fd020860533e18c64a93d14d11cb2d34bc9cbaf
author Tony Wickham <twickham@google.com> 1476308323 -0700
committer Tony Wickham <twickham@google.com> 1476308323 -0700

resolve merge conflicts of 2fd0208 to ub-launcher3-master

Change-Id: I20ad6eaace81786be080e28d6eb551908add6d90