am 6720bb83: am 26c91fa6: Merge change I4ff96000 into eclair-mr2

Merge commit '6720bb8314600a2b55a18159b4a22dc4b18aec88'

* commit '6720bb8314600a2b55a18159b4a22dc4b18aec88':
  new gservices flag for delaying bad gmail operations