Jeff Hamilton ff4e6f58d6 am 0ccac6e3: Merge "Merge commit \'446aea40\' into manualmerge" into honeycomb-plus-aosp ...

* commit '0ccac6e3ee687930d411be69b3bb6904656d128d':
  API changes for NFC.

2011-01-24 14:34:46 -08:00

..

1.xml

…

2.xml

…

3.xml

…

4.xml

…

5.xml

…

6.xml

Move updated 6.xml from eclair-sholes-release into eclair

2009-11-20 14:13:12 -08:00

7.xml

Restore 7.xml.

2009-12-04 12:35:50 -08:00

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

am 0ccac6e3: Merge "Merge commit \'446aea40\' into manualmerge" into honeycomb-plus-aosp

2011-01-24 14:34:46 -08:00