tree 18b1f8e49848251d2ce47881e08c7d75c4104c22
parent ee34a49ffc92590cb59f3e17a3df136b67701529
parent 9cd797902ec8404c5958214fc078d75e87248bf3
author Scott Main <smain@google.com> 1280766230 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280766230 -0700

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

Merge commit '9cd797902ec8404c5958214fc078d75e87248bf3' into gingerbread

* commit '9cd797902ec8404c5958214fc078d75e87248bf3':
  Doc change: Add nexus one to dev phones.