tree 5406cd6fa42489be6088ce490709b3534d69adc5
parent 50b1150a777a4b0203cdce881d0f11e93f25026c
parent 26b4f9189c192ab62ddfa300b8c70fccd420d845
author The Android Open Source Project <initial-contribution@android.com> 1265388335 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265388335 -0800

am 26b4f918: reconcile main tree with open-source eclair

Merge commit '26b4f9189c192ab62ddfa300b8c70fccd420d845' into eclair-plus-aosp

* commit '26b4f9189c192ab62ddfa300b8c70fccd420d845':
  android-2.1_r1 snapshot