Merge commit 'ea6fca8231c94064917e40dea23be8df50930cf9' into eclair-plus-aosp * commit 'ea6fca8231c94064917e40dea23be8df50930cf9': fix doc
Merge commit 'ea6fca8231c94064917e40dea23be8df50930cf9' into eclair-plus-aosp * commit 'ea6fca8231c94064917e40dea23be8df50930cf9': fix doc