tree b63f69256e3d430afa1f1451f5c82eb871fe8b33
parent 1ed3a13e7970e3c25a0ed7d31e70138b508ee0a2
parent ce7c6ff48ea95304d0013e3856fd939082d526ac
author Tao Bao <tbao@google.com> 1462207276 +0000
committer android-build-merger <android-build-merger@google.com> 1462207276 +0000

Merge "recovery: Always log the update attempt. am: 5687001895 am: f13662a349" into nyc-mr1-dev-plus-aosp
am: ce7c6ff48e

* commit 'ce7c6ff48ea95304d0013e3856fd939082d526ac':

Change-Id: I029717857d934b998d4f81eacb725548646fefe2