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