Jeff Hamilton 437ff39c74 resolved conflicts for merge of eb645a15 to honeycomb-plus-aosp ...

Change-Id: Idc241a61ea3f506f8c0877f4dcdabb89a2635c13

2011-01-25 18:00:41 -06:00

..

1.xml

…

2.xml

…

3.xml

…

4.xml

…

5.xml

…

6.xml

…

7.xml

…

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 eb645a15 to honeycomb-plus-aosp

2011-01-25 18:00:41 -06:00