am cac3126c: am 5340bffd: am 5827d3ea: Merge "Properly note the current active...

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

Merge commit 'cac3126c6109854640266c4807e5aa8e6a87142f'

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