tree ed2db0fd21ec4961b5e11ad4fa69f9693d22973b
parent 8806a907a3078865e08a021501863285758c4385
parent 952e01354e12e96a11795d72c452a89a4c233d23
author The Android Open Source Project <initial-contribution@android.com> 1265407758 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265407758 -0800

am 952e0135: am 63e547ef: reconcile main tree with open-source eclair

Merge commit '952e01354e12e96a11795d72c452a89a4c233d23'

* commit '952e01354e12e96a11795d72c452a89a4c233d23':
  android-2.1_r1 snapshot