am 6d547933: merge from open-source master

Merge commit '6d547933b8aa3a811499708bc8a4fea551599359'

* commit '6d547933b8aa3a811499708bc8a4fea551599359':
This commit is contained in:
Jean-Baptiste Queru 2009-09-04 11:06:01 -07:00 committed by Android Git Automerger
commit 8eb47bb13d

Diff content is not available