app_Settings

Go to file

Michael Chan 3a6b2df239 am 324ab848: Merge "b/2370089 Pop the dock dialog above the keyguard" into eclair

Merge commit '324ab8489cdc8ad4bff4e366940fa16e455f5933' into eclair-plus-aosp

* commit '324ab8489cdc8ad4bff4e366940fa16e455f5933':
  b/2370089 Pop the dock dialog above the keyguard

2010-01-20 16:10:29 -08:00

res

am 359b2bcc: Check in translations for new Settings strings. DO NOT MERGE

2010-01-20 15:59:27 -08:00

src/com/android/settings

b/2370089 Pop the dock dialog above the keyguard

2010-01-20 15:39:13 -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 0e2ab4f8: New top-level Dock in Settings and a Dock Settings screen with Audio item. #2367275

2010-01-18 23:42:44 -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