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

Merge commit '1db874720a58ff7e3684116d59ad08bc73db26d9'

* commit '1db874720a58ff7e3684116d59ad08bc73db26d9':
  android-2.1_r1 snapshot
This commit is contained in:
The Android Open Source Project 2010-02-05 14:14:46 -08:00 committed by Android Git Automerger
commit 34e6991c97

Diff content is not available