Sunny Goyal 488d4bdf26 resolved conflicts for merge of c451da70 to ub-launcher3-master ...

Change-Id: I738fa16f82b3f3f1f6c63c5d1ce81347ade6467a

2015-08-04 10:26:12 -07:00

..

android/launcher3

resolved conflicts for merge of c451da70 to ub-launcher3-master

2015-08-04 10:26:12 -07:00