tree 3671a0659776fb4f9427cf54dcbf5a467e964bc9
parent b5db45a6364753c801bc03f94613259c312b6aa6
parent 5cc978566314b54a6964185faeca94c747b48f2f
author The Android Open Source Project <initial-contribution@android.com> 1265388320 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265388320 -0800

am 5cc97856: reconcile main tree with open-source eclair

Merge commit '5cc978566314b54a6964185faeca94c747b48f2f' into eclair-plus-aosp

* commit '5cc978566314b54a6964185faeca94c747b48f2f':
  android-2.1_r1 snapshot