Dianne Hackborn ed60f81940 resolved conflicts for merge of 76450622 to master ...

Change-Id: I26ccd8f264e65f100d894f43cf597a781552db83

2011-06-02 09:20:52 -07:00

..

colors.xml

Move / copy some framework and systemui resources from xlarge to large. The status bar now comes up

2011-05-10 11:58:22 -07:00

config.xml

Rework how we decide whether to use system or status bar.

2011-05-26 10:46:19 -07:00

dimens.xml

First pass at integrating new ScrollView-based recents panel.

2011-05-18 16:03:31 -07:00

strings.xml

Move / copy some framework and systemui resources from xlarge to large. The status bar now comes up

2011-05-10 11:58:22 -07:00