tree af4a96bbc5821c673a67c7b52ee486dc893af93a
parent 8f20e5e540e9d2be8db31e2a9d8eb04a5621b494
parent 1cf67def06cdaa3fdae2a11fb967534b218028f3
author Scott Main <smain@google.com> 1280970138 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280970138 -0700

am 5b86de94: fix doc bugs

Merge commit '5b86de94a163ce4c52ab08a9820f9d78414e1767' into gingerbread

* commit '5b86de94a163ce4c52ab08a9820f9d78414e1767':
  fix doc bugs