Merge commit 'dd1bb33e017a10f800a6da37042a91859acf56e9' into eclair-plus-aosp * commit 'dd1bb33e017a10f800a6da37042a91859acf56e9': Aggregate the security settings for WiFi network configuration.
Merge commit 'dd1bb33e017a10f800a6da37042a91859acf56e9' into eclair-plus-aosp * commit 'dd1bb33e017a10f800a6da37042a91859acf56e9': Aggregate the security settings for WiFi network configuration.