Merge commit '531e580ab160864e4152f431eaeb965676c58d19' into eclair-plus-aosp * commit '531e580ab160864e4152f431eaeb965676c58d19': remove the incorrectly located nickname
Merge commit '531e580ab160864e4152f431eaeb965676c58d19' into eclair-plus-aosp * commit '531e580ab160864e4152f431eaeb965676c58d19': remove the incorrectly located nickname