Nick Pelly a53086c088 am 5cfbda15: resolved conflicts for merge of e5099cd3 to honeycomb-plus-aosp ...

* commit '5cfbda15425d078224405950c4be92471279f917':
  Change signature of MifareClassic.authenticate*() to throw IOException.

2011-01-21 16:05:47 -08:00

..

1.xml

…

2.xml

…

3.xml

…

4.xml

New API 4 with new CDMA constants.

2009-11-05 12:41:10 -08:00

5.xml

am 4deb52f3: am 20777fae: am 584bce31: Merge change I09282f5b into eclair

2009-11-04 21:06:42 -08:00

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

Merge "Cleaning up some StackView bad behavior" into honeycomb

2011-01-20 19:42:23 -08:00

current.xml

am 5cfbda15: resolved conflicts for merge of e5099cd3 to honeycomb-plus-aosp

2011-01-21 16:05:47 -08:00