am 9a77b613: merge from open-source master

Merge commit '9a77b613f3fdf6340b0f5f24d1c725fd0001e4a9'

* commit '9a77b613f3fdf6340b0f5f24d1c725fd0001e4a9':
This commit is contained in:
Jean-Baptiste Queru 2009-09-04 11:05:32 -07:00 committed by Android Git Automerger
commit af42fa0a7d

Diff content is not available