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