tree 15bac70d57942bb1396266f71f4a182392379ec4
parent bf3706f01e9a1a6c167f39c744ff4001e325c7fa
parent d750f8b3f78b2038b61974140ac340314ae52619
author Sunny Goyal <sunnygoyal@google.com> 1409270440 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409270440 +0000

am d750f8b3: Merge "Clear the promise flag once the restore animation is run and no more restore related tasks are pending" into ub-now-porkchop

* commit 'd750f8b3f78b2038b61974140ac340314ae52619':
  Clear the promise flag once the restore animation is run and no more restore related tasks are pending