Merge commit '1537a25520405f384b072c58fee935a29c4e14ea' into eclair-plus-aosp * commit '1537a25520405f384b072c58fee935a29c4e14ea': Remove unused api in QuickContact.java and fix the build.
Merge commit '1537a25520405f384b072c58fee935a29c4e14ea' into eclair-plus-aosp * commit '1537a25520405f384b072c58fee935a29c4e14ea': Remove unused api in QuickContact.java and fix the build.