Andrew Flynn 826a661d5b resolved conflicts for merge of a3e22d6a to master ...

Change-Id: I8770574acf86e280a9d15d4309686111260e09d9

2012-03-01 16:26:50 -08:00

..

attrs.xml

Adding workaround to make voice button target area larger (Bug 5653332)

2012-01-12 14:39:18 -08:00

colors.xml

resolved conflicts for merge of a3e22d6a to master

2012-03-01 16:26:50 -08:00

config.xml

resolved conflicts for merge of a3e22d6a to master

2012-03-01 16:26:50 -08:00

dimens.xml

resolved conflicts for merge of a3e22d6a to master

2012-03-01 16:26:50 -08:00

extra_wallpapers.xml

auto import from //depot/cupcake/@135843

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

strings.xml

Mark string format tokens as placeholders.

2012-02-24 10:17:44 -08:00

styles.xml

New small/large screen division for Launcher.

2012-02-29 17:30:37 -08:00

wallpapers.xml

Adding static wallpapers for crespo/tablet (Bug 5506089)

2011-12-07 14:25:29 -08:00