tree 6930deb10e9c1f0f7e7a160773455edbd0d027d4
parent c466c70ddf14d106362b1cf46c1ddf6aefa73a70
parent 549745cc8778f806e46809e472fbcf3c7f066b83
author Tianjie Xu <xunchang@google.com> 1464038924 +0000
committer android-build-merger <android-build-merger@google.com> 1464038924 +0000

resolve merge conflicts of 3aabd77 to nyc-mr1-dev-plus-aosp
am: 549745cc87

* commit '549745cc8778f806e46809e472fbcf3c7f066b83':
  Allow recovery to return error codes

Change-Id: I474bc0afb4e92ffafec9de60e1665e3aa3c2cf10