am 14ca79d2: Merge "Minor JavaDoc additions and some long line fixes." into gingerbread

Merge commit '14ca79d2a9f305abadcf98d4b3e579a4b79d78ab' into gingerbread-plus-aosp

* commit '14ca79d2a9f305abadcf98d4b3e579a4b79d78ab':
  Minor JavaDoc additions and some long line fixes.