tree 6f6b3952fa8e2237d5e831781d6f8e3d6432485d
parent 7d2301965621ccd10b0ab7afba37fffcc566b05a
parent 70e99bfe409b5cb116bf3f0512e3d05c13240eea
author kmccormick <kmccormick@google.com> 1364946666 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364946666 -0700

am 70e99bfe: am b50f2406: am 050f6611: am 78e5d183: Merge "Doc update: Misc doc bugs" into jb-mr1.1-docs

* commit '70e99bfe409b5cb116bf3f0512e3d05c13240eea':
  Doc update: Misc doc bugs