tree 479d9a4679474d812357bc35ffbb1e64f9a8190b
parent 20eedeb5ae4cddb3d9de0701e80509f07a9fe3b9
parent 6e74e899d314663415f54895227bb79a51fd734b
author Tony <tonyswickham@gmail.com> 1474684973 -0700
committer Tony <twickham@google.com> 1474685015 -0700

resolve merge conflicts of 6e74e89 to ub-launcher3-master

Change-Id: I34e449ca3a91ee06e1983ac3a83cb7ca53567a91