tree 55740bc94bc81bedffd174a1a86810c44da7685a
parent b65f253fdc60f6208a54911bee793d225f23cdf8
parent a3a9c69b4956ad6c056fb331cd685478b9402ef5
author The Android Open Source Project <initial-contribution@android.com> 1265407853 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265407853 -0800

am a3a9c69b: am 87d1452b: reconcile main tree with open-source eclair

Merge commit 'a3a9c69b4956ad6c056fb331cd685478b9402ef5'

* commit 'a3a9c69b4956ad6c056fb331cd685478b9402ef5':
  android-2.1_r1 snapshot