tree 6848692fe7de36f68b938e62e41e1e596eda94ca
parent 2721fbd20844b40778090e295d7fb90abca30f51
parent 1db874720a58ff7e3684116d59ad08bc73db26d9
author The Android Open Source Project <initial-contribution@android.com> 1265408086 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265408086 -0800

am 1db87472: am ba8bfedd: reconcile main tree with open-source eclair

Merge commit '1db874720a58ff7e3684116d59ad08bc73db26d9'

* commit '1db874720a58ff7e3684116d59ad08bc73db26d9':
  android-2.1_r1 snapshot