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