merge from open-source master

Change-Id: I2a8ec9d290fc1040ba53b9fe73f92b7f90dfdf16
This commit is contained in:
The Android Open Source Project 2010-07-20 10:25:37 -07:00
commit e38fb359a9

Diff Content Not Available