am 8bd51121: am daf0b895: Cherry-pick f0e5e933 from master.

* commit '8bd511218db56fc6e6bc1c383758577de7b4e657':
  Cherry-pick f0e5e933 from master.
This commit is contained in:
Xavier Ducrohet
2011-01-11 13:52:39 -08:00
committed by Android Git Automerger

Diff Content Not Available