tree 7b3b20da7e526b362a5bea23640e44a3af3c5912
parent 3e19cc3e007971baeb518870c1fdc1975ff3c9de
parent e7261692c2dbbfb66aba09199d0d9d8e4f254949
author Sunny Goyal <sunnygoyal@google.com> 1409275631 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409275631 +0000

am e7261692: 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 'e7261692c2dbbfb66aba09199d0d9d8e4f254949':
  Clear the promise flag once the restore animation is run and no more restore related tasks are pending