52a243b9a8
Merge commit 'cc22efb52e8b5851b7d53099f7f814bfae266124' into eclair-plus-aosp * commit 'cc22efb52e8b5851b7d53099f7f814bfae266124': docs only.