tree 19040e43e7c52a874c9210324ba6a10de9180fb4
parent f0b57e615d61207728fb4a6b57944e3b51eb9678
parent aebeea4cf39acae833b1b7f27a4c08d3b55dee37
author Scott Kennedy <skennedy@google.com> 1358191153 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1358191153 -0800

am aebeea4c: am 5d6d6aab: am 8e45679a: am 026f9191: am 08342698: Merge "docs: Fix a bunch of issues" into jb-mr1-dev

* commit 'aebeea4cf39acae833b1b7f27a4c08d3b55dee37':
  docs: Fix a bunch of issues