app_Settings

Go to file

Eric Fischer 0c8848e273 am 978a9512: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Settings into eclair-mr2-plus-aosp

Merge commit '978a95129323da61aaf2dc0d39302ae0cb043ba2'

* commit '978a95129323da61aaf2dc0d39302ae0cb043ba2':
  Show an error message when the remote side cancels the authentication
  Import revised translations.  DO NOT MERGE

2009-10-13 12:04:33 -07:00

res

am c49ca127: Merge change I02f58e89 into eclair

2009-10-12 11:17:03 -07:00

src/com/android/settings

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

2009-10-08 17:52:42 -07: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