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