Daniel Nishi 87559ef035 resolve merge conflicts of 2c826d7 to master ...

Change-Id: I2b2a1b195f07143690f5902b6a6f78ba1b30d7ea

2016-09-27 10:00:09 -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

resolve merge conflicts of 2c826d7 to master

2016-09-27 10:00:09 -07: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

Use a config flag instead of a RO flag for showing Manage Storage.

2016-09-19 20:39:33 +00: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

Allow system apps to add to settings dashboard

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

ids.xml

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

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

strings.xml

Improve text for VR Settings. am: f345b8cb36 am: 5220c925fc

2016-09-27 02:30:35 +00: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