The Android Open Source Project 00c406364e merge from open-source master ...

Change-Id: I7d167c97600bbf25e2ed8872cffecd9fa5b1db7c

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

..

res

merge from open-source master

2010-06-11 13:31:28 -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