Kenny Root ebd93b52e6 resolved conflicts for merge of dbdbd152 to master ...

Change-Id: Icb172e3d8c2eaec8156bdc37d12efb238054b507

2010-08-24 10:13:00 -07:00

..

arrays.xml

Show history of battery level.

2010-06-11 12:46:21 -07:00

attrs.xml

Show history of battery level.

2010-06-11 12:46:21 -07:00

bools.xml

Feature #2296147 Settings for Car/Desk Dock on certain devices

2009-12-02 15:36:34 -08:00

colors.xml

Add credential storage settings.

2009-07-03 23:00:53 +08:00

dimens.xml

New widgets

2009-10-27 14:05:27 -07:00

strings.xml

resolved conflicts for merge of dbdbd152 to master

2010-08-24 10:13:00 -07:00

styles.xml

Work on the device admin settings UI.

2010-01-26 11:09:32 -08:00