Tony Wickham 8aea3b185a resolve merge conflicts of d5dbf6175 to ub-launcher3-master ...

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I2aefe84331c3236993bf23bd982d639b2ba2499e

2017-05-19 12:03:45 -07:00

..

attrs.xml

Adding an option to change the shadow size

2017-05-17 13:43:45 -07:00

bools.xml

Adding broadcast receiver to handle SESSION_COMMIT broadcast

2017-03-09 10:56:09 -08:00

colors.xml

resolve merge conflicts of 02aced978 to ub-launcher3-dorval-polish

2017-05-19 10:52:19 -07:00

config.xml

Merge changes from topic 'am-103e12ab-e4f5-4f1e-a8f6-6b164b13e8de' into ub-launcher3-master

2017-05-18 01:06:46 +00:00

dimens.xml

Adding an option to change the shadow size

2017-05-17 13:43:45 -07:00

drawables.xml

Creating a custom drawable to customize shadow.

2017-04-27 05:35:28 -07:00

strings.xml

Merge changes from topic 'am-103e12ab-e4f5-4f1e-a8f6-6b164b13e8de' into ub-launcher3-master

2017-05-18 01:06:46 +00:00

styles.xml

Don't set system shortcut text to white

2017-05-18 15:31:19 -07:00