app_Settings

Go to file

Michael Chan ed2ebf509b am 488a80a7: Merge change Id587a517 into eclair

Merge commit '488a80a7b111f5906bf51101785a95a6c640d265' into eclair-plus-aosp

* commit '488a80a7b111f5906bf51101785a95a6c640d265':
  b/2314560 Prevent PIN dialog from showing up on undocked docks

2009-12-09 17:47:17 -08:00

res

am 0c75b2d2: Merge change I80790bdb into eclair

2009-12-07 20:50:54 -08:00

src/com/android/settings

Merge change Id587a517 into eclair

2009-12-09 17:44:53 -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 0c75b2d2: Merge change I80790bdb into eclair

2009-12-07 20:50:54 -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