merge from open-source master

Change-Id: I9d0122dbf1a9c2bd1898c41766c5bf4320f2313a
This commit is contained in:
The Android Open Source Project 2010-06-30 15:51:09 -07:00
commit 60faafcf01

Diff Content Not Available