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