Tony Wickham c1ff24c077 resolve merge conflicts of a3c74d10a7 to ub-launcher3-master. ...

Change-Id: Ibeb2499ac278e4094a2922501cfffad2489e58ed

2015-10-30 10:37:43 -07:00

..

attrs.xml

Removing some unused resources

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

colors.xml

Fixing widgets container inactive scroll bar color.

2015-08-24 15:24:17 -07:00

config.xml

Moving a few testing classes to a separate package

2015-10-07 11:12:38 -07:00

dimens.xml

resolve merge conflicts of a3c74d10a7 to ub-launcher3-master.

2015-10-30 10:37:43 -07:00

strings.xml

am 44b48f77: am 28c6b963: Showing a permission prompt for direct call shortcuts

2015-10-14 19:19:24 +00:00

styles.xml

Removing some unused resources

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