am b4b73756: merge from open-source master

Merge commit 'b4b73756d426ee99df615a0a37a71c2ff79a0d38'

* commit 'b4b73756d426ee99df615a0a37a71c2ff79a0d38':
This commit is contained in:
Jean-Baptiste Queru
2009-10-14 16:20:05 -07:00
committed by Android Git Automerger

Diff Content Not Available