tree 330f67bbeb8f4f9bd9cb52a58b7fc4825080ae4b
parent f77fff4b4e904486bf25affde713294d40764e15
parent 36fa47139d4621dc4bf8d89caa8650495d901b00
author Christopher Tate <ctate@google.com> 1271898944 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1271898944 -0700

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

Merge commit '36fa47139d4621dc4bf8d89caa8650495d901b00' into froyo-plus-aosp

* commit '36fa47139d4621dc4bf8d89caa8650495d901b00':
  Fix security hole in Google backup transport registration