tree 940c9d3e5c0280f878ae62101a171c3512d97e1b
parent db485da2a961ccfdcefacd5073ad024884c827c9
parent 4f1a2db34498ba6addb0d0307bbd33ab25ddcee1
author Winson Chung <winsonc@google.com> 1326312367 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1326312367 -0800

am 4f1a2db3: Merge "Fixing issue where we may continue to restore the wrong page after resetting."

* commit '4f1a2db34498ba6addb0d0307bbd33ab25ddcee1':
  Fixing issue where we may continue to restore the wrong page after resetting.