Merge commit '7589398cf9127987a768ccfb3dbb9cde54d00f02' into gingerbread * commit '7589398cf9127987a768ccfb3dbb9cde54d00f02': Doc change: Add nexus one to dev phones image.
Merge commit '7589398cf9127987a768ccfb3dbb9cde54d00f02' into gingerbread * commit '7589398cf9127987a768ccfb3dbb9cde54d00f02': Doc change: Add nexus one to dev phones image.