tree c97aa31cabdae1cbe418ed2c54aa5868d4b0954b
parent 3cff2cd950402834bca39547f96959de69058242
parent 5e6e10f4f8bc3fa0bcbb34b4e7bec9f74adbb7f7
author Scott Main <smain@google.com> 1276624041 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1276624041 -0700

am e4bca7ee: am 322e7e47: Merge "docs: fix markup error" into froyo

Merge commit 'e4bca7ee60c6d361ef9f1f025881a6f80a9efdab' into gingerbread-plus-aosp

* commit 'e4bca7ee60c6d361ef9f1f025881a6f80a9efdab':
  docs: fix markup error