Jeff Hamilton b0cae14175 Merge commit '446aea40' into manualmerge ...

Conflicts:
	api/current.xml

Change-Id: Ic58c56929d8281eca2e801903d9ab98d03e7f975

2011-01-24 16:31:38 -06:00

..

1.xml

…

2.xml

…

3.xml

…

4.xml

…

5.xml

…

6.xml

…

7.xml

…

8.xml

Hide two audio focus methods.

2010-05-11 14:28:38 -07:00

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

Merge commit '446aea40' into manualmerge

2011-01-24 16:31:38 -06:00