fc82f6b562
Merge commit '3e21bf473a89688918f4e59fac4ba2d4539e3775' into eclair-plus-aosp * commit '3e21bf473a89688918f4e59fac4ba2d4539e3775': docs only.