tree 7213e328e813e537c543fa171b7a674474c63744
parent 409b7b1b0c9e62fb15c79a13ca194c7cef060542
parent d2425ed063863b502600a4d80d01f362021bd61a
author Greg Kaiser <gkaiser@google.com> 1457991719 +0000
committer android-build-merger <android-build-merger@google.com> 1457991719 +0000

resolve merge conflicts of 0222db01fd to nyc-dev-plus-aosp
am: d2425ed063

* commit 'd2425ed063863b502600a4d80d01f362021bd61a':
  otafault: Fix setting of have_eio_error.