am 9f78ffb2: am 615f8446: reconcile main tree with open-source eclair

Merge commit '9f78ffb27e8f6a9de6a9db1d04887cf1eedfff81'

* commit '9f78ffb27e8f6a9de6a9db1d04887cf1eedfff81':
  android-2.1_r1 snapshot
This commit is contained in:
The Android Open Source Project
2010-02-05 14:22:33 -08:00
committed by Android Git Automerger

Diff Content Not Available