am dbddf810: am 85805203: am 9fac1da4: Merge "In javadoc, it\'s @return, not @returns." into gingerbread

Merge commit 'dbddf810f56f34d645c500889477761ff860d3a9' into dalvik-dev

* commit 'dbddf810f56f34d645c500889477761ff860d3a9':
  In javadoc, it's @return, not @returns.