tree b9f8f2a4fc8b96467388192d08ca61fae66e338c
parent 144c8eb7abbfcfdc7ffcc8caa57472b9b7dbda62
parent f18b9311e8a6c4b05574727ae117338a9c341a1b
author Scott Main <smain@google.com> 1255569091 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1255569091 -0700

am f18b9311: am 30a6657e: Merge change Ic9b31801 into eclair

Merge commit 'f18b9311e8a6c4b05574727ae117338a9c341a1b' into eclair-mr2-plus-aosp

* commit 'f18b9311e8a6c4b05574727ae117338a9c341a1b':
  docs: setup new SDK documentation for 2.0 and change sdk build version to 2.0...