Jason Monk 7eda07bc5f resolved conflicts for e0d175ed to master ...

Change-Id: Ia9f6e2f5af2ee4e5b944a80407bfedf7f9b30a1b

2015-09-23 18:55:44 -04:00

..

aliases.xml

[LockScreen] Setup Wizard pattern lock landscape layout

2015-05-26 11:29:35 -07:00

arrays.xml

UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER

2015-07-30 16:34:01 -07:00

attrs.xml

Make Theme a DropDownPreference

2015-06-01 15:49:17 -04:00

bools.xml

To hide none security option, use config_hide_none_security_option config

2015-09-02 13:51:44 -07:00

colors.xml

[Fingerprint] Use accent color for fingerprint highlight

2015-07-14 01:22:38 +00:00

config.xml

Update fingerprint enroll UI to spec.

2015-04-24 14:26:15 -07:00

dimens.xml

am 656c805b: am 70238114: am 6e58d516: Refactor UidDetailProvider and its dependencies to SettingsLib.

2015-08-25 18:45:34 +00:00

donottranslate.xml

Allow system apps to add to settings dashboard

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

ids.xml

Improve Search results highlighting

2014-06-19 13:58:22 -07:00

strings.xml

resolved conflicts for e0d175ed to master

2015-09-23 18:55:44 -04:00

styles.xml

[Fingerprint] Add fingerprint enroll in setup wizard

2015-07-15 11:14:22 -07:00

themes.xml

[Fingerprint] Use different ring size for setup

2015-08-07 10:48:48 -07:00