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

Merge commit '615f84460214276708732c8f43ba4e04df30a14d' into eclair-plus-aosp

* commit '615f84460214276708732c8f43ba4e04df30a14d':
  android-2.1_r1 snapshot
This commit is contained in:
The Android Open Source Project
2010-02-05 08:48:16 -08:00
committed by Android Git Automerger

Diff Content Not Available