Gloria Wang 9580b8ce65 resolved conflicts for merge of e6ad0e47 to gingerbread-plus-aosp ...

Change-Id: I63b00932b0f8b975da31aa9a010369db2d49fd76

2010-10-07 15:27:17 -07: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

Undo API patch due to field pulled up to superclass.

2010-09-12 18:01:28 -07:00

current.xml

resolved conflicts for merge of e6ad0e47 to gingerbread-plus-aosp

2010-10-07 15:27:17 -07:00