Dianne Hackborn 1c391ed88c resolved conflicts for merge of a82e7e24 to master

2009-11-19 14:26:47 -08:00

..

1.xml

AI 148803: Update 1.xml and 2.xml for methods that take Generic Type Varargs. This will allow the CTS Signature Test to be run against older android releases.

2009-05-13 15:29:11 -07:00

2.xml

AI 148803: Update 1.xml and 2.xml for methods that take Generic Type Varargs. This will allow the CTS Signature Test to be run against older android releases.

2009-05-13 15:29:11 -07:00

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

Fix issue #2258571: Fix build versions

2009-11-12 17:02:03 -08:00

current.xml

resolved conflicts for merge of a82e7e24 to master

2009-11-19 14:26:47 -08:00