tree 2780a34563e83acfe5c7ddf6e0c100ee1adefc46
parent 6c18e8adf29f059c5b5d3c73c4aa24cce86251cf
parent 29d60b95fa8019c0542f46551057c4d376bb8a7a
author Elliott Hughes <enh@google.com> 1394243512 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394243512 +0000

am 29d60b95: am 8d41e653: Merge "Miscellaneous small documentation fixes."

* commit '29d60b95fa8019c0542f46551057c4d376bb8a7a':
  Miscellaneous small documentation fixes.