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

Merge commit 'c3fd52ed00409e99fdcb6ac28754e79613410470'

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