Merge commit '7d7ab5ae21dcabc5d0a3a5798d1d0e8c1b057d23' into eclair-mr2-plus-aosp * commit '7d7ab5ae21dcabc5d0a3a5798d1d0e8c1b057d23': fix a javadoc build breakage
Merge commit '7d7ab5ae21dcabc5d0a3a5798d1d0e8c1b057d23' into eclair-mr2-plus-aosp * commit '7d7ab5ae21dcabc5d0a3a5798d1d0e8c1b057d23': fix a javadoc build breakage