Nick Pelly fd06cc10ac resolved conflicts for merge of 0065f398 to honeycomb-plus-aosp ...

Change-Id: I1fcb292287f82605db41d330ae840fb5f617847b

2011-01-25 10:26:54 -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

Throw Base64DataException instead of IOException

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

current.xml

resolved conflicts for merge of 0065f398 to honeycomb-plus-aosp

2011-01-25 10:26:54 -08:00