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

Merge commit 'd3579580df0cea7e37334d83ef7a9aa85ad70368' into gingerbread-plus-aosp

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

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base