tree 7b444374b5f46e0da6535a6dc473f95ce6a0edad
parent b32a74c73b1433a3613419e61c05f6ff8efb5b41
parent 8bf77456cec82cbda3393a4e48f265af1670e795
author Scott Main <smain@google.com> 1274296263 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1274296263 -0700

am 8bf77456: am 8d0e37f5: Merge "docs: revise platform intro" into froyo

Merge commit '8bf77456cec82cbda3393a4e48f265af1670e795' into kraken

* commit '8bf77456cec82cbda3393a4e48f265af1670e795':
  docs: revise platform intro