Jaikumar Ganesh 435ad270b5 resolved conflicts for merge of 1b7ffcf4 to master

2009-09-16 11:56:11 -07:00

..

arrays.xml

Make running services show dependent processes.

2009-09-10 12:08:53 -07:00

attrs.xml

Add an icon to the left of the settings at the top level.

2009-07-31 07:24:08 -07:00

colors.xml

Add credential storage settings.

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

dimens.xml

Adopt new AppWidget assets, per http://b/2038594.

2009-08-06 22:37:08 -07:00

strings.xml

resolved conflicts for merge of 1b7ffcf4 to master

2009-09-16 11:56:11 -07:00

styles.xml

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00