merge from open-source master

Change-Id: I4ddfc902e70c85ab8b11698fc08df7247e46d0a9
This commit is contained in:
The Android Open Source Project 2010-06-09 12:17:03 -07:00
commit 5e1b2f531d

Diff Content Not Available