app_Settings

Go to file

Michael Chan 4e1e2d2bf6 am 0c75b2d2: Merge change I80790bdb into eclair

Merge commit '0c75b2d2dc35b88d5cb9db96afc72ed074ca5350' into eclair-plus-aosp

* commit '0c75b2d2dc35b88d5cb9db96afc72ed074ca5350':
  b/2296110 Dialog for setting up dock audio.

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

res

am 0c75b2d2: Merge change I80790bdb into eclair

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

src/com/android/settings

Merge change I80790bdb into eclair

2009-12-07 20:48:16 -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