Merge commit '75f1d43b64cbf4b68ad62919a0c58907933ccd59' into eclair-plus-aosp * commit '75f1d43b64cbf4b68ad62919a0c58907933ccd59': fix doc
Merge commit '75f1d43b64cbf4b68ad62919a0c58907933ccd59' into eclair-plus-aosp * commit '75f1d43b64cbf4b68ad62919a0c58907933ccd59': fix doc