Marco Nelissen c81e43c8ee resolved conflicts for merge 31957f1b to eclair-mr2

2009-10-29 18:04:17 -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

am ac18e4f2: Update 4.xml with the native status change of breakText/measureText

2009-09-29 18:15:46 -07:00

5.xml

Update 5.xml with last minute changes.

2009-10-19 12:42:28 -07:00

current.xml

resolved conflicts for merge 31957f1b to eclair-mr2

2009-10-29 18:04:17 -07:00