app_Settings

Go to file

Eric Fischer 8ba6a2d5e8 am c197f154: am 06a111be: (-s ours) Merge change Ia3151ad3 into eclair

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

* commit 'c197f15486c053e89bc610c7e7b497130f4fb5a7':
  Import revised translations.   DO NOT MERGE

2009-10-07 11:52:21 -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

am c0e34db1: Merge change Ifad4a4c0 into eclair

2009-10-07 11:46:38 -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