tree 69d6a47242f47951fc81617abee8d63d8b26de93
parent ada948d26b0bcfd8e7d79cf01029ed5ea084cdab
parent d845a2d1ea4e2ce17d8f788d5ae33bab2bb82dd2
author Tao Bao <tbao@google.com> 1440684838 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440684838 +0000

am d845a2d1: am 73468ee8: (-s ours) am 5a16eba2: am eef99138: Merge "updater: Remove the unused isunresumable in SaveStash()."

* commit 'd845a2d1ea4e2ce17d8f788d5ae33bab2bb82dd2':