Merge commit 'a60479d2ea7857455ebad6c56e357d00b0492364' into eclair-plus-aosp * commit 'a60479d2ea7857455ebad6c56e357d00b0492364': Fixing broken javadoc.
Merge commit 'a60479d2ea7857455ebad6c56e357d00b0492364' into eclair-plus-aosp * commit 'a60479d2ea7857455ebad6c56e357d00b0492364': Fixing broken javadoc.