5a25769584
Merge commit 'dd6a5895f1fe18fafdd78d96002618f2419f7979' * commit 'dd6a5895f1fe18fafdd78d96002618f2419f7979': sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.