Merge commit 'a1103f336d01d0a5dcb07afc89cd1bc7ec0ece69' into eclair-plus-aosp * commit 'a1103f336d01d0a5dcb07afc89cd1bc7ec0ece69': docs only.
Merge commit 'a1103f336d01d0a5dcb07afc89cd1bc7ec0ece69' into eclair-plus-aosp * commit 'a1103f336d01d0a5dcb07afc89cd1bc7ec0ece69': docs only.