am a7978d3b: merge from open-source master

Merge commit 'a7978d3bb0070495a9310dde4befa22a5b5ace4d'

* commit 'a7978d3bb0070495a9310dde4befa22a5b5ace4d':
This commit is contained in:
Jean-Baptiste Queru
2009-10-14 16:28:41 -07:00
committed by Android Git Automerger

Diff Content Not Available