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