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