Steve Pfetsch f002f23f91 resolve merge conflicts of 259b6a8029 to master. ...

Change-Id: I5aa772839591d6f09d672a04ab8606fd39dd4a97

2016-01-22 17:43:33 -08:00

..

aliases.xml

Fixes alignment for fingerprint animation during setup.

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

arrays.xml

Settings: Add option to disable logging

2015-12-22 15:14:56 -08:00

attrs.xml

Add dot page indicator to preview screen pager.

2016-01-15 10:48:04 -08: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

Merge "Make A11y SUW launchable from SUW and small UX changes based on last round of UX studies."

2016-01-22 17:56:19 +00:00

config.xml

Enable color temperature developer setting

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

dimens.xml

Merge "Move restricted padlock support to SettingsLib"

2016-01-12 18:25:00 +00:00

donottranslate.xml

…

ids.xml

…

strings.xml

resolve merge conflicts of 259b6a8029 to master.

2016-01-22 17:43:33 -08:00

styles.xml

Add dot page indicator to preview screen pager.

2016-01-15 10:48:04 -08:00

themes.xml

Merge "Make A11y SUW launchable from SUW and small UX changes based on last round of UX studies."

2016-01-22 17:56:19 +00:00