Sunny Goyal fafd4c276e resolved conflicts for merge of ebfae6e2 to ub-launcher3-master ...

Change-Id: I1e0d5f1140e910b68322c4f5061d0a3c383899f0

2015-08-27 16:47:13 -07:00

..

attrs.xml

…

colors.xml

…

config.xml

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

2015-08-27 16:47:13 -07:00

dimens.xml

…

strings.xml

…

styles.xml

…