commit | 5340bffd8bb2599d15ee79cca3c62d2e7c7ea961 | [log] [tgz] |
---|---|---|
author | Dianne Hackborn <hackbod@google.com> | Thu Jun 24 16:01:39 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 24 16:01:39 2010 -0700 |
tree | 096582a2a1cf7e1615296ac4e020d9e28dfe8ecb | |
parent | 01e4cfc47d0a2c7e7ab383d2fb23224ec52c0301 [diff] | |
parent | 5827d3eaf3c53d1dc3ab0d638d935c219a5515a6 [diff] |
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