tree 7b3b20da7e526b362a5bea23640e44a3af3c5912
parent 83acc755ac17b741fd9088efeed99fcd304071cc
parent 4f88bfb7af74930aee99e10abe3c0ad3ab54b06c
author Sunny Goyal <sunnygoyal@google.com> 1409267552 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1409267553 +0000

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