tree 94eafab00ab65f5dac4f53e8a23b4fbca193100c
parent a25ab813c4ebcac876209e026ec7aef4588d77a3
parent 9568fb21766684083ec256303a6ed7949ada7d9f
author Christopher Tate <ctate@android.com> 1253564500 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1253564500 -0700

am 9568fb21: Merge change 26164 into eclair

Merge commit '9568fb21766684083ec256303a6ed7949ada7d9f' into eclair-plus-aosp

* commit '9568fb21766684083ec256303a6ed7949ada7d9f':
  Reset backup tracking in response to transport data-wipe notification