app_Settings

Go to file

Jim Miller 356ceb5853 am be699645: Merge change I56544d0e into eclair

Merge commit 'be699645dbae746c431caf9c0736938c55fda588' into eclair-plus-aosp

* commit 'be699645dbae746c431caf9c0736938c55fda588':
  Fix for 2137900: Be more conservative about poking the wakelock

2009-09-29 15:49:00 -07:00

res

am 69c51fea: New icons

2009-09-29 00:51:39 -07:00

src/com/android/settings

Merge change I56544d0e into eclair

2009-09-29 18:41:44 -04:00

tests

auto import from //depot/cupcake/@135843

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

Android.mk

auto import from //branches/cupcake/...@137197

2009-03-09 11:52:14 -07:00

AndroidManifest.xml

am d7705d4c: Fix 2147749: Make Settings.ACTION_SOUND_SETTINGS work

2009-09-29 11:20:59 -07:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

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

NOTICE

auto import from //depot/cupcake/@135843

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