am bf226c93: merge from open-source master

Merge commit 'bf226c93f93becc22b4bfce7f4a2878186e42c12'

* commit 'bf226c93f93becc22b4bfce7f4a2878186e42c12':
This commit is contained in:
Jean-Baptiste Queru 2009-10-14 16:12:32 -07:00 committed by Android Git Automerger
commit 2411f28f6c

Diff Content Not Available