Nick Pelly 0cad3d23d3 resolved conflicts for merge of a701cf85 to honeycomb-merge ...

Change-Id: I81a63599649a61fc73bf1e7ebcfed4c333903070

2011-01-27 16:59:02 -08: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 a701cf85 to honeycomb-merge

2011-01-27 16:59:02 -08:00