merge from open-source master

Change-Id: Ia22080192681c2ac596582d6cfdac732b1ff4c9f
This commit is contained in:
The Android Open Source Project 2010-07-09 10:47:23 -07:00
commit 611793d6ab