am 7e93aad4: am 36fa4713: Merge "Fix security hole in Google backup transport...
am 7e93aad4: am 36fa4713: Merge "Fix security hole in Google backup transport registration" into froyo
Merge commit '7e93aad4' into kraken
* commit '7e93aad4':
Fix security hole in Google backup transport registration