The Android Open Source Project 73550d28df merge from froyo-plus-aosp ...

Change-Id: I6c6ee9c9567f5aef7e1beb585296c1e2fb884e9a

2010-06-14 11:48:15 -07:00

..

res

merge from froyo-plus-aosp

2010-06-14 11:48:15 -07:00

src/com/android/settings

merge from open-source master

2010-06-11 13:31:28 -07:00

Android.mk

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

AndroidManifest.xml

merge from open-source master

2010-06-11 13:31:28 -07:00