Maurice Lam e4f9b74924 resolve merge conflicts of c8466a3 to master ...

Change-Id: I2fce0f0eaa70bb5196faee0143dfbfbcc93659fa

2016-06-15 11:26:32 -07:00

..

aliases.xml

Fix truncated text in pattern lock setup

2016-05-10 11:38:03 -07:00

arrays.xml

Delete a bunch of dead code and resources.

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

attrs.xml

Added new setting for gestures.

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

bools.xml

Add an automatic storage management job service.

2016-05-31 16:50:48 +00:00

colors.xml

Merge \\"Added new setting for gestures.\\" into nyc-mr1-dev am: 8b8a012913

2016-06-13 23:17:22 +00:00

config.xml

Revert "Add an option allowing to skip wallpaper apps selection."

2016-05-25 21:08:47 +00:00

dimens.xml

Merge \\"Added new setting for gestures.\\" into nyc-mr1-dev am: 8b8a012913

2016-06-13 23:17:22 +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

Merge \\"Fingerprint string updates\\" into nyc-mr1-dev am: e33872772c

2016-06-15 18:16:05 +00:00

styles.xml

Merge "Update UI style for GLIF buttons" into nyc-mr1-dev

2016-06-15 17:07:54 +00:00

themes.xml

Merge "Make fingerprint inherit from GLIF theme" into nyc-mr1-dev

2016-05-26 18:54:02 +00:00