Merge commit 'c49ca127aa993dc2ae402680ce392da06f0e1d4c' into eclair-plus-aosp * commit 'c49ca127aa993dc2ae402680ce392da06f0e1d4c': SecuritySettings: clean up.
Merge commit 'c49ca127aa993dc2ae402680ce392da06f0e1d4c' into eclair-plus-aosp * commit 'c49ca127aa993dc2ae402680ce392da06f0e1d4c': SecuritySettings: clean up.