tree e57a15f28ad10ddacefdbbd83f83c3b531a374b4
parent d633215b60cc9a8c64cca8d6e7f6af6dfd0fbfb1
parent 74e151c54c31cf7324771fcabc06e9fbfe1118ca
author Scott Main <smain@google.com> 1274198859 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1274198859 -0700

am 74e151c5: am 5f1d1002: Merge "docs: fix markup error" into froyo

Merge commit '74e151c54c31cf7324771fcabc06e9fbfe1118ca' into kraken

* commit '74e151c54c31cf7324771fcabc06e9fbfe1118ca':
  docs: fix markup error