Merge commit '5392556b65261b5da86301d9b038a12cf70e6197' into eclair-plus-aosp * commit '5392556b65261b5da86301d9b038a12cf70e6197': Fix documentation.
Merge commit '5392556b65261b5da86301d9b038a12cf70e6197' into eclair-plus-aosp * commit '5392556b65261b5da86301d9b038a12cf70e6197': Fix documentation.