tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent f972bf0617d1f2f5b151b048921035e792afa60a
parent 88d7cbb0466e578f2970dc1b5e45e911d2de41d8
author Sunny Goyal <sunnygoyal@google.com> 1422669700 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669700 +0000

am 88d7cbb0: 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 '88d7cbb0466e578f2970dc1b5e45e911d2de41d8':