tree f7699cbb9a798281b3558f7e9588fd6d418a7a39
parent 8199f491720b5bc1736bfa17047f22c5ea10196a
parent 0cb428518679211b5656f039ab41b1ff0cb19a1b
author The Android Open Source Project <initial-contribution@android.com> 1265388168 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265388168 -0800

am 0cb42851: reconcile main tree with open-source eclair

Merge commit '0cb428518679211b5656f039ab41b1ff0cb19a1b' into eclair-plus-aosp

* commit '0cb428518679211b5656f039ab41b1ff0cb19a1b':
  android-2.1_r1 snapshot