tree 7b58fd9d7e3a1979a20b21e638c2fa7c7026fc93
parent ee4e57e94903f497c936aa23e474e26ba74182c5
parent e879c389cf9bbbba209a35dc9c9b152489482711
author The Android Open Source Project <initial-contribution@android.com> 1265407798 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265407798 -0800

am e879c389: am be0a1d3b: reconcile main tree with open-source eclair

Merge commit 'e879c389cf9bbbba209a35dc9c9b152489482711'

* commit 'e879c389cf9bbbba209a35dc9c9b152489482711':
  android-2.1_r1 snapshot