Salvador Martinez 923534f641 resolve merge conflicts of 8ec7028 to master ...

Change-Id: I02767dea7e2fd8e6dfdfe495af1c28587b080630

2016-09-07 10:24:03 -07:00

..

aliases.xml

Remove setup specific FP find sensor layout

2016-06-23 20:30:52 -07:00

arrays.xml

Delete a bunch of dead code and resources.

2016-05-23 18:50:05 +00:00

attrs.xml

Fix layout transition from Display->Ambient Display to Gestures

2016-07-06 13:21:08 -07:00

bools.xml

Only show BootSounds preference if has_boot_sounds is true. am: fd351eaaf1 am: de67bc9d68

2016-08-29 13:39:23 +00:00

colors.xml

Merge \\"Revert \\"Revert \\"Error colors to point to frameworks instead of hard-coding them\\"\\"\\" into nyc-mr1-dev am: d739ea38fb

2016-07-21 01:38:22 +00:00

config.xml

Disable Gestures Settings by default.

2016-07-11 12:10:58 -07:00

dimens.xml

Merge \\"Update the Bluetooth pin pairing view to the new spec.\\" into nyc-mr1-dev am: 391f67e484

2016-07-21 01:02:16 +00:00

donottranslate.xml

…

ids.xml

Add accessibility actions to the drag-and-drop locale list

2016-04-21 17:09:51 -07:00

strings.xml

resolve merge conflicts of 8ec7028 to master

2016-09-07 10:24:03 -07:00

styles.xml

Add scrollbar to Settings app.

2016-08-18 15:58:21 -07:00

themes.xml

Add scrollbar to Settings app.

2016-08-23 10:46:06 -07:00