tree 7e144bac66c0547b4ee1ceb75cfce337c761c025
parent 39d48d33d2ba1ff2a68661facb0a39b79ba36253
parent 0e114ab7024033e2afda010d977be01db4d7a934
author The Android Open Source Project <initial-contribution@android.com> 1265407823 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265407823 -0800

am eaf951c5: am 75753107: reconcile main tree with open-source eclair

Merge commit 'eaf951c59631829c84ac71b413cf7b2ff186be17'

* commit 'eaf951c59631829c84ac71b413cf7b2ff186be17':
  android-2.1_r1 snapshot