tree 69d6a47242f47951fc81617abee8d63d8b26de93
parent 5e3a40f934ca7d435496dfacf00b7909d3b3d98d
parent 73468ee8fb5b152b3c8be19ade89e9a31d733316
author Tao Bao <tbao@google.com> 1440646730 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440646730 +0000

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

* commit '73468ee8fb5b152b3c8be19ade89e9a31d733316':