am 3766ed3e: am a5fe776a: Merge "fix javadoc error which breaks SDK build in...
am 3766ed3e: am a5fe776a: Merge "fix javadoc error which breaks SDK build in gingerbread" into gingerbread
Merge commit '3766ed3e'
* commit '3766ed3e':
fix javadoc error which breaks SDK build in gingerbread