Brad Fitzpatrick bd80a12cba resolved conflicts for merge of 9240f16d to honeycomb-plus-aosp ...

Change-Id: I6e595bb11a5a692ccd730b9d1d2aa367063a61f5

2011-01-19 15:19:08 -08:00

..

1.xml

…

2.xml

…

3.xml

…

4.xml

…

5.xml

…

6.xml

…

7.xml

…

8.xml

…

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

Updated the Time/Date pickers to be backwards compatible

2011-01-19 12:35:17 -08:00

current.xml

resolved conflicts for merge of 9240f16d to honeycomb-plus-aosp

2011-01-19 15:19:08 -08:00