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

Change-Id: I8770574acf86e280a9d15d4309686111260e09d9

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

..

all_apps_cling.xml

Updating Clings. (5057945, 5056643)

2011-09-18 18:38:11 -07:00

application.xml

Adding keyboard focus support for phones.

2011-05-09 16:03:19 -07:00

apps_customize_application.xml

Fixing issues with spring loaded adding.

2011-07-11 11:38:24 -07:00

folder_cling.xml

Tweaking size of QSB and updating cling assets.

2011-09-28 16:51:26 -07:00

folder_icon.xml

Fix a lot of easy lint issues

2012-02-24 12:53:08 -08:00

hotseat.xml

New small/large screen division for Launcher.

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

launcher.xml

New small/large screen division for Launcher.

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

search_bar.xml

Fix a lot of easy lint issues

2012-02-24 12:53:08 -08:00

workspace_cling.xml

Updating Clings. (5057945, 5056643)

2011-09-18 18:38:11 -07:00