app_Settings

Go to file

Jaikumar Ganesh 4e580673f2 am 613549a6: Merge change I2c3621d1 into eclair

Merge commit '613549a622eac8278c9f81a1df83484c256652bf' into eclair-plus-aosp

* commit '613549a622eac8278c9f81a1df83484c256652bf':
  Fix desk dock getting stuck after unpairing.

2009-12-10 02:46:39 -08:00

res

am e273289c: Merge change Ic0ce5c9a into eclair

2009-12-09 18:10:21 -08:00

src/com/android/settings

Merge change I2c3621d1 into eclair

2009-12-10 02:44:12 -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