Tony Wickham 72c689a7a2 resolved conflicts for d70a4b7b to ub-launcher3-master ...

Change-Id: Ib04f80eeebf551fc026925830fc4739d1c620513

2015-10-08 18:32:22 -07:00

..

config.xml

Moving all apps code into sub package.

2015-05-22 12:21:40 -07:00

dimens.xml

Grid adjustments, specifically for Ryu.

2015-10-08 09:23:10 -07:00

styles.xml

Removing some unused resources

2015-10-05 14:14:19 -07:00