Jeff Hamilton 505be50d32 am 95f7c854: Merge "resolved conflicts for merge of eb645a15 to honeycomb-plus-aosp" into honeycomb-plus-aosp ...

* commit '95f7c8549928c0b383b3b3651224ded6b05a2f51':
  Use classnames instead of ints for NFC techs.

2011-01-25 16:21:28 -08: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

Throw Base64DataException instead of IOException

2011-01-24 16:47:56 -08:00

current.xml

am 95f7c854: Merge "resolved conflicts for merge of eb645a15 to honeycomb-plus-aosp" into honeycomb-plus-aosp

2011-01-25 16:21:28 -08:00