am 7e93aad4: am 36fa4713: Merge "Fix security hole in Google backup transport registration" into froyo

Merge commit '7e93aad42d5f96e4e3a471e49384e1ce794c9411' into kraken

* commit '7e93aad42d5f96e4e3a471e49384e1ce794c9411':
  Fix security hole in Google backup transport registration