am c3169def: am 6002de42: am 6248bff9: Merge "Remove an incorrect javadoc comment." into froyo

Merge commit 'c3169defa19a824f69b455b5e672931680a194b9'

* commit 'c3169defa19a824f69b455b5e672931680a194b9':
  Remove an incorrect javadoc comment.