da32be5e06
Merge commit '1ab3ebad95e6b537719ee2f608c1fbc321e51f06' into eclair-plus-aosp * commit '1ab3ebad95e6b537719ee2f608c1fbc321e51f06': Removing references to deprecated API and the deprecated API itself.