Jorim Jaggi cb9d7a96bb resolved conflicts for 99bbec73 to master ...

Change-Id: I0d837f89eff37dc3469502fa41e294a9302c17bb

2015-09-09 18:48:27 -07:00

..

aliases.xml

…

arrays.xml

UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER

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

attrs.xml

…

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

…

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

…

ids.xml

…

strings.xml

resolved conflicts for 99bbec73 to master

2015-09-09 18:48:27 -07: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