Jeff Hamilton 71208ce454 resolved conflicts for merge of ca36d863 to honeycomb-merge ...

Change-Id: Idb00dc86e265b2aaed8852912e1f9d8659fd2835

2011-01-26 11:27:51 -06:00

..

1.xml

…

2.xml

…

3.xml

…

4.xml

…

5.xml

…

6.xml

…

7.xml

…

8.xml

…

9.xml

Remove API that snuck into MockPackageManager

2011-01-17 13:13:37 -08:00

10.xml

Remove API that snuck into MockPackageManager

2011-01-17 13:13:37 -08:00

11.xml

Honeycomb is now officially API 11.

2011-01-23 14:56:39 -08:00

current.xml

resolved conflicts for merge of ca36d863 to honeycomb-merge

2011-01-26 11:27:51 -06:00