merge from open-source master

Change-Id: I51b4eccfde8e74c69ab8e0c051bb8ea718ee7101
This commit is contained in:
The Android Open Source Project 2010-05-13 09:04:45 -07:00
commit e154bdd19d

Diff Content Not Available