merge from open-source master

Change-Id: I94b3aacb3478b1d9e0751c02bb301d5f9a2cf05c
This commit is contained in:
The Android Open Source Project 2010-05-19 09:20:22 -07:00
commit 5b417743a5

Diff Content Not Available