am 26c91fa6: Merge change I4ff96000 into eclair-mr2

Merge commit '26c91fa694464c79de39988f9f42cee375ff0a14' into eclair-mr2-plus-aosp

* commit '26c91fa694464c79de39988f9f42cee375ff0a14':
  new gservices flag for delaying bad gmail operations