Dianne Hackborn 58520b24d4 resolved conflicts for merge of 10d5b096 to master ...

Change-Id: Id5c6ba651f72b48f0d70ee2ca64a6c9adf5e74f7

2010-10-04 14:54:59 -07: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

AI 146222: Manual merge of 145980 from donutburger => master.

2009-04-14 15:40:20 -07:00

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

am 89b4cb1e: am ff38e38d: Merge "Undo API patch due to field pulled up to superclass." into gingerbread

2010-09-12 18:16:22 -07:00

current.xml

resolved conflicts for merge of 10d5b096 to master

2010-10-04 14:54:59 -07:00