merge from open-source master

Change-Id: Iae0a5fadd57d651a614ed1c07afc949fe0637551
This commit is contained in:
The Android Open Source Project 2010-07-19 12:17:53 -07:00
commit d5ffb200b6

Diff Content Not Available