app_Settings

Go to file

Amith Yamasani 213c35c052 am d8d21279: Merge "Don\'t allow monkey to play with SIM lock settings. Bug # 2358489. DO NOT MERGE" into eclair

Merge commit 'd8d2127936faac93806e5a64447cee0fd8dd2d62' into eclair-plus-aosp

* commit 'd8d2127936faac93806e5a64447cee0fd8dd2d62':
  Don't allow monkey to play with SIM lock settings. Bug # 2358489. DO NOT MERGE

2010-01-12 16:12:28 -08:00

res

am 04e32ff3: Merge "b/2335545 Revert the dock strings back to "For Music and Media"" into eclair

2010-01-06 15:47:57 -08:00

src/com/android/settings

Merge "Don't allow monkey to play with SIM lock settings. Bug # 2358489. DO NOT MERGE" into eclair

2010-01-12 16:10:17 -08:00

tests

Import revised translations. DO NOT MERGE

2009-11-16 16:45:29 -08:00

Android.mk

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

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

AndroidManifest.xml

am 1d5f14bd: Merge change I92124d28 into eclair

2009-12-09 17:47:21 -08: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