tree c0cc831f80cb0846ddfef476af0aaf9b927106f2
parent 5126633a3e7d04754792e0702231b1b6be2d1498
parent e4bca7ee60c6d361ef9f1f025881a6f80a9efdab
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