e3a3a872a9
Merge commit '0c91049482cd9467a29c2387766cfcef371d859c' into eclair-plus-aosp * commit '0c91049482cd9467a29c2387766cfcef371d859c': docs only.