am 0637db6c: merge from open-source master

Merge commit '0637db6c8d91df04cf51f114774f377215718ecd'

* commit '0637db6c8d91df04cf51f114774f377215718ecd':
This commit is contained in:
The Android Open Source Project
2010-07-16 13:50:35 -07:00
committed by Android Git Automerger

Diff Content Not Available