tree 5a196250a7b7793e6e7190bdfc659b49f596c7da
parent cf6df894fa8fbda563a8bf836f47b0f12d663c84
parent 2836cc573a12cbe12e7d2fce7468c1a83374e510
author The Android Open Source Project <initial-contribution@android.com> 1265408321 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265408321 -0800

am 2836cc57: reconcile main tree with open-source eclair

Merge commit '2836cc573a12cbe12e7d2fce7468c1a83374e510'

* commit '2836cc573a12cbe12e7d2fce7468c1a83374e510':
  android-2.1_r1 snapshot