pkanwar 7fe0c25f77 resolve merge conflicts of de67e0b to nyc-mr1-dev-plus-aosp ...

Change-Id: I9213ec0dc937bd20ff705f4deb41c10a4e69c227

2016-05-05 18:53:08 -07:00

..

aliases.xml

Fixes alignment for fingerprint animation during setup.

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

arrays.xml

Remove band preference in WiFi settings.

2016-03-11 08:28:18 -08:00

attrs.xml

Add moar dividers

2016-04-04 13:20:59 -04: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

Bring escalation options UI closer to mock.

2016-05-04 08:58:00 -07:00

config.xml

Create feature factory interface & initial impl.

2016-04-19 23:01:49 +00:00

dimens.xml

Display setting and support in a tab layout - DO NOT MERGE

2016-04-20 11:42:15 -07: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 de67e0b to nyc-mr1-dev-plus-aosp

2016-05-05 18:53:08 -07:00

styles.xml

Prompt sign-in when there is no account for support options

2016-04-28 14:40:07 -07:00

themes.xml

Merge "UX polish tweaks to FallbackHome." into nyc-dev

2016-05-04 17:34:56 +00:00