tree 76b5246ca7433d3c18cfb4a1bb7cd67e63afa4c6
parent 530cace41741ee5c04d4e9bfb993d91e5d1f489a
parent 9c3119adb14168017aa579d69fbc4b40e451f162
author The Android Open Source Project <initial-contribution@android.com> 1265408398 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265408398 -0800

am 9c3119ad: reconcile main tree with open-source eclair

Merge commit '9c3119adb14168017aa579d69fbc4b40e451f162'

* commit '9c3119adb14168017aa579d69fbc4b40e451f162':
  android-2.1_r1 snapshot