tree 2a77229ae63e1a87f157c7fcdd1c0ed6132e9a3f
parent ad2886325081a47ebb173468717d66a0486dcf9c
parent 026f91915f2ad710b93284b9a604d3c39161b2ed
author Scott Kennedy <skennedy@google.com> 1358190686 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1358190686 -0800

am 026f9191: am 08342698: Merge "docs: Fix a bunch of issues" into jb-mr1-dev

* commit '026f91915f2ad710b93284b9a604d3c39161b2ed':
  docs: Fix a bunch of issues