Jason Monk e74ae23269 resolve merge conflicts of 65b5952 to master ...

Change-Id: I0adc036416f21dfa7dd671d4920bce5c26fe7cb6

2016-04-08 13:34:47 -04:00

..

aliases.xml

Fixes alignment for fingerprint animation during setup.

2016-01-14 16:30:49 -08:00

arrays.xml

Remove band preference in WiFi settings.

2016-03-11 08:28:18 -08:00

attrs.xml

Add moar dividers

2016-04-04 13:20:59 -04:00

bools.xml

Merge "Allow manual to be read from disk" into mnc-dr-dev

2015-10-01 00:08:05 +00:00

colors.xml

Update preview border.

2016-03-10 13:14:30 -08:00

config.xml

Enable color temperature developer setting

2016-01-17 01:23:44 -08:00

dimens.xml

Merge "Dashboard status cards UI."

2016-04-07 23:10:07 +00:00

donottranslate.xml

Allow system apps to add to settings dashboard

2015-03-25 11:11:36 -04:00

ids.xml

Mark UI components for tests to find.

2016-04-01 23:18:11 -06:00

strings.xml

resolve merge conflicts of 65b5952 to master

2016-04-08 13:34:47 -04:00

styles.xml

Dashboard status cards UI.

2016-04-07 13:23:37 -07:00

themes.xml

NPE on "Nexus Imprint"

2016-03-28 11:07:50 -07:00