merge from open-source master

Change-Id: Iecaa5654c4829e51b687bf5bc4be2215ffbad66a
This commit is contained in:
The Android Open Source Project 2010-07-09 14:26:40 -07:00
commit fae32a91bc

Diff content is not available