tree 2fad0023faa97e3180cb480de385b4856e702d54
parent 2eb12a47224f1617787c09824107ac6bc22f9b3e
parent 5340bffd8bb2599d15ee79cca3c62d2e7c7ea961
author Dianne Hackborn <hackbod@google.com> 1277420647 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1277420647 -0700

am 5340bffd: am 5827d3ea: Merge "Properly note the current active restore set\'s token" into froyo

Merge commit '5340bffd8bb2599d15ee79cca3c62d2e7c7ea961' into gingerbread-plus-aosp

* commit '5340bffd8bb2599d15ee79cca3c62d2e7c7ea961':
  Properly note the current active restore set's token