tree 69dcac174d58dacb62573aee90adbfc278e5f68e
parent 8b8df906a9ab63f92b9747f10859e4db602ba387
parent 63e547ef590180d4810d85179fd5d8704e9617c5
author The Android Open Source Project <initial-contribution@android.com> 1265387185 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265387185 -0800

am 63e547ef: reconcile main tree with open-source eclair

Merge commit '63e547ef590180d4810d85179fd5d8704e9617c5' into eclair-plus-aosp

* commit '63e547ef590180d4810d85179fd5d8704e9617c5':
  android-2.1_r1 snapshot