Merge from open-source master

This commit is contained in:
The Android Open Source Project 2010-02-11 12:37:53 -08:00
commit 701be40c7e

Diff content is not available