app_Settings

Go to file

Jaikumar Ganesh 18f9d189ba am e60a8ebd: am bb334392: Merge change 25354 into eclair

Merge commit 'e60a8ebd0e2a1911c0c5ac5f5b1d3e8f1c212cb1'

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

2009-09-17 12:09:30 -07:00

res

am 9752a844: am dd1bb33e: Merge change 24646 into eclair

2009-09-17 09:52:42 -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 e74b1c6a: am 10d3cf50: Enable cert install from sdcard in Settings...

2009-09-17 09:52:33 -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