merge from open-source master

Change-Id: I56de40bad4be52a06300bfc310e16d27b2fb14df
This commit is contained in:
The Android Open Source Project 2010-06-07 16:32:53 -07:00
commit e475488b11

Diff Content Not Available