Merge commit 'e0030418fd4b9a9a2d0422a5538a76ca6b40710c' into eclair-mr2-plus-aosp * commit 'e0030418fd4b9a9a2d0422a5538a76ca6b40710c': sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
Merge commit 'e0030418fd4b9a9a2d0422a5538a76ca6b40710c' into eclair-mr2-plus-aosp * commit 'e0030418fd4b9a9a2d0422a5538a76ca6b40710c': sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.