tree 3a0955c356258c55ad517378c819ba1e4927fd47
parent 0f28cd7d2d4967ce9a796497387e8dbfd19666c6
parent fec2448d0bfef2b3f1e1db5d1c0e1397829293fe
author The Android Open Source Project <initial-contribution@android.com> 1265408175 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265408175 -0800

am fec2448d: am 26b4f918: reconcile main tree with open-source eclair

Merge commit 'fec2448d0bfef2b3f1e1db5d1c0e1397829293fe'

* commit 'fec2448d0bfef2b3f1e1db5d1c0e1397829293fe':
  android-2.1_r1 snapshot