tree 9a9cf5d9953881fc1211ba08b1a823a874ad5269
parent 7da1ad699989db8417ce54eb26697eae4a30f634
parent 32189e260c8dee27d561bf67c0333c9b9927636b
author Scott Main <smain@google.com> 1343242509 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343242509 -0700

am 32189e26: Merge "misc doc bug fixes" into jb-dev

* commit '32189e260c8dee27d561bf67c0333c9b9927636b':
  misc doc bug fixes