am 4011770f: merge from open-source master

Merge commit '4011770f2d06fcb743abc91a01a531c7ae2d9175'

* commit '4011770f2d06fcb743abc91a01a531c7ae2d9175':
This commit is contained in:
Jean-Baptiste Queru
2009-10-14 16:11:42 -07:00
committed by Android Git Automerger

Diff Content Not Available