48edf7c002
Merge commit 'd1da5fa2da9690be94929e391a4e66b9986573bc' into eclair-plus-aosp * commit 'd1da5fa2da9690be94929e391a4e66b9986573bc': Revert "SDK doc change: Add doc update for NDKr3."