Merge commit 'c15255a979c9fc70bc251aefdcd9c1074b458d49' into eclair-plus-aosp * commit 'c15255a979c9fc70bc251aefdcd9c1074b458d49': Add a PRIVACY_SETTINGS action to launch the new Privacy settings screen.
Merge commit 'c15255a979c9fc70bc251aefdcd9c1074b458d49' into eclair-plus-aosp * commit 'c15255a979c9fc70bc251aefdcd9c1074b458d49': Add a PRIVACY_SETTINGS action to launch the new Privacy settings screen.