tree b5bf837e24a0693235f819a08e1edf1d451c4e98
parent f9be43305a74fc1c8123cb4eb5c74347acce8a13
parent be4696e073b93e0e65f767e77166a08efd67c6cb
author Scott Main <smain@google.com> 1281046683 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281046683 -0700

am be4696e0: am 7589398c: Merge "Doc change: Add nexus one to dev phones image." into froyo

Merge commit 'be4696e073b93e0e65f767e77166a08efd67c6cb' into gingerbread-plus-aosp

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