| commit | ab32c11fd2792a27db5dd0d355511d5c695ce085 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Thu Jun 24 16:02:03 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 24 16:02:03 2010 -0700 |
| tree | aeb38e192659057f2b43059de62140ebd002d5df | |
| parent | b7687fd9a6fd42b8b425984dc752ce7aedd297f0 [diff] | |
| parent | 2f90b21533b97da4f061a415535609590ff1b2bf [diff] |
am 5827d3ea: Merge "Properly note the current active restore set\'s token" into froyo Merge commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6' into froyo-plus-aosp * commit '5827d3eaf3c53d1dc3ab0d638d935c219a5515a6': Properly note the current active restore set's token