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