merge from open-source master

Change-Id: I87dc9cac9d5bf8543de8273e8b0bf72ec22e2d5f
This commit is contained in:
The Android Open Source Project 2010-07-16 13:42:31 -07:00
commit ea0f37b52c

Diff Content Not Available