app_Settings

Go to file

Eric Fischer c3ce286b5c am 11c54616: am e273289c: (-s ours) Merge change Ic0ce5c9a into eclair

Merge commit '11c546162a489be5cc3a698e5c9f0bc4d3e65cab' into eclair-mr2-plus-aosp

* commit '11c546162a489be5cc3a698e5c9f0bc4d3e65cab':
  Import revised translations.  DO NOT MERGE

2009-12-10 17:49:43 -08:00

res

am 2ff62e2c: Wifi diagnostic app to enable debug and provide information

2009-12-10 15:18:33 -08:00

src/com/android/settings

am d70e205b: Merge change I724fc8fd into eclair

2009-12-10 17:41:34 -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 5217a122: am 1d5f14bd: Merge change I92124d28 into eclair

2009-12-10 17:49:37 -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