Merge commit '1d15167865b22730cf6ba314a057e62f960aa1db' into eclair-plus-aosp * commit '1d15167865b22730cf6ba314a057e62f960aa1db': sdk doc change for esr: fix some broken links to resources files.
Merge commit '1d15167865b22730cf6ba314a057e62f960aa1db' into eclair-plus-aosp * commit '1d15167865b22730cf6ba314a057e62f960aa1db': sdk doc change for esr: fix some broken links to resources files.