am ee76ed9c: am 4198cece: Merge "Fix the rest of the javadoc warnings." into gingerbread

Merge commit 'ee76ed9c0df11ac70ae67bae051cb64c9d79dafb'

* commit 'ee76ed9c0df11ac70ae67bae051cb64c9d79dafb':
  Fix the rest of the javadoc warnings.