Nick Pelly 30098efbca resolved conflicts for merge of d64d711d to honeycomb-merge ...

Change-Id: Ibe2c6d9f3d0070fb62f8385a9f49e605be37c885

2011-01-25 16:13:17 -08: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

Honeycomb is now officially API 11.

2011-01-23 14:56:39 -08:00

current.xml

resolved conflicts for merge of d64d711d to honeycomb-merge

2011-01-25 16:13:17 -08:00