am ded649b8: (-s ours) am 1a9f6bf7: (-s ours) CherryPick 676e13 from master to mr0. do not merge.

* commit 'ded649b809c3bf66fe54d98e8c0cd017f8a504be':
  CherryPick 676e13 from master to mr0. do not merge.
This commit is contained in:
Xavier Ducrohet
2011-10-24 13:19:57 -07:00
committed by Android Git Automerger

Diff Content Not Available