am bda8e345: (-s ours) am 31644792: am 75cfe25d: Increase EmailServiceProxy timeout for validation attempts

Merge commit 'bda8e345f8797fa8b6bf1b83c86e9c28496b36ab'

* commit 'bda8e345f8797fa8b6bf1b83c86e9c28496b36ab':
  Increase EmailServiceProxy timeout for validation attempts
This commit is contained in:
Marc Blank 2010-09-20 19:31:14 -07:00 committed by Android Git Automerger
commit 9525425804

Diff Content Not Available