merge from open-source master

Change-Id: Id2305d345a6cc248e08c0bdc6f3c8d999cc1d861
This commit is contained in:
The Android Open Source Project 2010-06-08 13:17:41 -07:00
commit 57e32fb1ce

Diff Content Not Available