app_Settings

Go to file

Amith Yamasani 33aa0fadf8 am cab9fe2d: Merge change I3c9f79ba into eclair-mr2

Merge commit 'cab9fe2d41eba522a485dcad2b8e91f789e48c57' into eclair-mr2-plus-aosp

* commit 'cab9fe2d41eba522a485dcad2b8e91f789e48c57':
  Retain webview history when viewing Safety notices. Fixes #2160518

2009-10-06 15:18:15 -07:00

res

Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Settings into eclair-mr2-plus-aosp

2009-10-06 03:05:02 -07:00

src/com/android/settings

Merge change I3c9f79ba into eclair-mr2

2009-10-06 16:58:21 -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