tree b321622187db63fbd219e5cb83c0006afcaf88be
parent 9c269f4c6f27f15256d4a08ff1e3640b3c47b6fd
parent dbf94ec67a1bd5ec9937962dbda1f735beffa248
author The Android Open Source Project <initial-contribution@android.com> 1265388397 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265388397 -0800

am dbf94ec6: reconcile main tree with open-source eclair

Merge commit 'dbf94ec67a1bd5ec9937962dbda1f735beffa248' into eclair-plus-aosp

* commit 'dbf94ec67a1bd5ec9937962dbda1f735beffa248':
  android-2.1_r1 snapshot