app_Settings

Go to file

Jaikumar Ganesh e60a8ebd0e am bb334392: Merge change 25354 into eclair

Merge commit 'bb3343923c640461eecc4fac25f911224a16d056' into eclair-plus-aosp

* commit 'bb3343923c640461eecc4fac25f911224a16d056':
  Fix string name for bluetooth pairing and fix NPE

2009-09-17 08:41:11 -07:00

res

am dd1bb33e: Merge change 24646 into eclair

2009-09-16 03:32:58 -07:00

src/com/android/settings

Merge change 25354 into eclair

2009-09-16 18:29:31 -04:00

tests

auto import from //depot/cupcake/@135843

2009-03-03 19:32:34 -08:00

Android.mk

auto import from //branches/cupcake/...@137197

2009-03-09 11:52:14 -07:00

AndroidManifest.xml

am bb334392: Merge change 25354 into eclair

2009-09-17 08:41:11 -07: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