tree 004c09655fce1048693ebbe34d3a3bfdf94c13e1
parent f28cf9518aba6860847cde9171a078021419df0b
parent 48ffea93dff6b952b4ad5818b748dadd2dd7c19e
author The Android Open Source Project <initial-contribution@android.com> 1265408029 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265408029 -0800

am 48ffea93: am cf69b0c7: reconcile main tree with open-source eclair

Merge commit '48ffea93dff6b952b4ad5818b748dadd2dd7c19e'

* commit '48ffea93dff6b952b4ad5818b748dadd2dd7c19e':
  android-2.1_r1 snapshot