am 3530ef81: reconcile main tree with open-source eclair

Merge commit '3530ef81d13e243bb568b8d33327f5fdda8a5b1a' into eclair-plus-aosp

* commit '3530ef81d13e243bb568b8d33327f5fdda8a5b1a':
  android-2.1_r1 snapshot
This commit is contained in:
The Android Open Source Project 2010-02-05 08:49:52 -08:00 committed by Android Git Automerger
commit 4d9f4905a9

Diff Content Not Available