tree aabe7e3ececb9abc289873ad208cbc2b4cbb86ba
parent 2b51f47a4cc06086e63bdc3e03fab28631c79972
parent 77a66069eb8fa0b99d090effa1d71b1fec992bdd
author Scott Main <smain@google.com> 1280766975 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280766975 -0700

am 77a66069: am d3579580: am 9cd79790: Merge "Doc change: Add nexus one to dev phones." into froyo

Merge commit '77a66069eb8fa0b99d090effa1d71b1fec992bdd'

* commit '77a66069eb8fa0b99d090effa1d71b1fec992bdd':
  Doc change: Add nexus one to dev phones.