am 14e7d693: Merge "Some documentation fixes." into gingerbread

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

* commit '14e7d693415832a974abc298124a6a5797d49a04':
  Some documentation fixes.