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
This commit is contained in:
Dianne Hackborn 2010-06-24 16:04:07 -07:00 committed by Android Git Automerger
commit d4002eef0f

Diff Content Not Available