tree 0c51b66a56e624bcd9729cec0454f4e3febddeb8
parent d07d5a72938fd52415368c2320fc29575ae9a0c3
parent 89c45519c99bd0b1633f307673d32dc4b40a3402
author The Android Open Source Project <initial-contribution@android.com> 1265408091 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265408091 -0800

am 89c45519: reconcile main tree with open-source eclair

Merge commit '89c45519c99bd0b1633f307673d32dc4b40a3402'

* commit '89c45519c99bd0b1633f307673d32dc4b40a3402':
  android-2.1_r1 snapshot