Sunny Goyal 7c50b31f57 resolve merge conflicts of 3826bab27e to ub-launcher3-calgary. ...

Change-Id: I14ff2d67de4ba97628bdf651602724f9f4989173

2016-02-10 12:27:51 -08:00

..

launcher.xml

resolve merge conflicts of 3826bab27e to ub-launcher3-calgary.

2016-02-10 12:27:51 -08:00