Charles Chen bd3e0ce5a2 resolved conflicts for merge of 3e522c45 to master

2009-07-17 09:44:53 -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

Fix the DEFAULT_SORT_ORDER value for media files. Changing this

2009-07-06 09:58:06 -07:00

current.xml

resolved conflicts for merge of 3e522c45 to master

2009-07-17 09:44:53 -07:00