tree 4119fcb5207d036ed1b5e19d7edc7cdf8e289781
parent 08b7e78597b06b3801d909c9e9ca1538ed9fc355
parent dd4448ef6807f096cdfdf632857baefd7cbc85ec
author Scott Main <smain@google.com> 1343253939 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343253939 -0700

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

* commit 'dd4448ef6807f096cdfdf632857baefd7cbc85ec':
  misc doc bug fixes