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

Merge commit '3766ed3eed6be0a9e78193166bab64bf25f02e81'

* commit '3766ed3eed6be0a9e78193166bab64bf25f02e81':
  fix javadoc error which breaks SDK build in gingerbread