tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 127ac2c115ef6047671c0d7557d110e47a09cbae
parent 38e80fadc5f8dc1bc9d595e9820e69c39a981c4a
author Sunny Goyal <sunnygoyal@google.com> 1422685321 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685321 +0000

am 38e80fad: 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 '38e80fadc5f8dc1bc9d595e9820e69c39a981c4a':