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