tree 1020d81dba5ab17377fafd790cbda464c3b385c7
parent d19c397b04f485e0af5990f3541e703934869290
parent 2950555aac546cd95b7ae268b5851895e1289ec2
author Dianne Hackborn <hackbod@google.com> 1277420406 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1277420406 -0700

Merge "Properly note the current active restore set's token" into froyo