OSDN Git Service

am 5827d3ea: Merge "Properly note the current active restore set\'s token" into froyo
authorDianne Hackborn <hackbod@google.com>
Thu, 24 Jun 2010 23:01:39 +0000 (16:01 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 24 Jun 2010 23:01:39 +0000 (16:01 -0700)
commitd965b79268bfca085048532d9baab3d7cd99b6c0
treedeb076b69ffbc2939d2a76c0fb3cdd38053f668d
parente0bdac3197d42b8585b167106e3f7b1d9ec15842
parent2f90b21533b97da4f061a415535609590ff1b2bf
am 5827d3ea: Merge "Properly note the current active restore set\'s token" into froyo

Merge commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6' into gingerbread

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