Merge commit 'd2c494d9be366aed081742c097b97816a6ed9d44' into eclair-plus-aosp * commit 'd2c494d9be366aed081742c097b97816a6ed9d44': add class description and revise descriptions for
Merge commit 'd2c494d9be366aed081742c097b97816a6ed9d44' into eclair-plus-aosp * commit 'd2c494d9be366aed081742c097b97816a6ed9d44': add class description and revise descriptions for