Merge commit '1eb1df082d59bdef8b3e0cda6d1af635449833ab' into eclair-plus-aosp * commit '1eb1df082d59bdef8b3e0cda6d1af635449833ab': Add strings for authentication type.
Merge commit '1eb1df082d59bdef8b3e0cda6d1af635449833ab' into eclair-plus-aosp * commit '1eb1df082d59bdef8b3e0cda6d1af635449833ab': Add strings for authentication type.