app_Settings

Go to file

Bjorn Bringert 793a9afc61 am 1ac497b2: am d6e36463: Merge change Ib5077943 into eclair-mr2

Merge commit '1ac497b219aef7de2de4449a93666ab4ba5cb181'

* commit '1ac497b219aef7de2de4449a93666ab4ba5cb181':
  Fix NPE when APPWIDGET_PICK has no value for EXTRA_CUSTOM_INFO

2009-12-10 14:39:36 -08:00

res

am af03e5f0: am 41eb3841: am 0c75b2d2: Merge change I80790bdb into eclair

2009-12-10 06:59:02 -08:00

src/com/android/settings

am 1ac497b2: am d6e36463: Merge change Ib5077943 into eclair-mr2

2009-12-10 14:39:36 -08:00

tests

b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth

2009-11-05 18:32:09 -08:00

Android.mk

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

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

AndroidManifest.xml

am 41eb3841: am 0c75b2d2: Merge change I80790bdb into eclair

2009-12-09 15:42:29 -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