am 17210f0b: (-s ours) Cherrypick 944311 from master. do not merge.

* commit '17210f0b8de483ba0d44d8187fc6c69f73fbdd7d':
  Cherrypick 944311 from master. do not merge.
This commit is contained in:
David Turner 2011-09-28 16:45:33 -07:00 committed by Android Git Automerger
commit d645ddc0ae

Diff Content Not Available