app_Settings

Go to file

Chung-yih Wang 9e1b267ebb am 9752a844: am dd1bb33e: Merge change 24646 into eclair

Merge commit '9752a84445f224c28514c19645e8d640068d9df9'

* commit '9752a84445f224c28514c19645e8d640068d9df9':
  Aggregate the security settings for WiFi network configuration.

2009-09-17 09:52:42 -07:00

res

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

2009-09-17 09:52:42 -07:00

src/com/android/settings

resolved conflicts for merge of 1b7ffcf4 to master

2009-09-16 11:56:11 -07: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