app_Settings

Go to file

Amith Yamasani a2e2a21060 am 213c35c0: (-s ours) am d8d21279: Merge "Don\'t allow monkey to play with SIM lock settings. Bug # 2358489. DO NOT MERGE" into eclair

Merge commit '213c35c052375632487469c88227883ff1a0f1ac'

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

2010-01-12 16:14:30 -08:00

res

Merge "Haptic feedback setting doesn't need to be disabled in Silent mode."

2010-01-12 14:24:15 -08:00

src/com/android/settings

Merge "Settings: Switch to new MountService api names"

2010-01-12 13:50:28 -08:00

tests

Deprecate fill_parent and introduce match_parent.

2010-01-08 15:11:59 -08:00

Android.mk

Do not use a user tag on apps, as it is ignored.

2010-01-05 16:29:09 -08:00

AndroidManifest.xml

Fix 2332563: Add password-lock support to lockscreen

2010-01-11 15:51:59 -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