tree 161906dde0f5435962cf384b8e57b12c1d3d9512
parent ceff34155019bfc69be5b786097d4195fc035afe
parent ea31b47a72a6fed1269e2ba3c29c438212322bf0
author Scott Main <smain@google.com> 1344556996 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1344556996 -0700

am ea31b47a: Merge "fix misc doc bugs from external issues" into jb-dev

* commit 'ea31b47a72a6fed1269e2ba3c29c438212322bf0':
  fix misc doc bugs from external issues