tree 2da9ac489f855912e85dfabefcb92da841b9fe31
parent bd43d7e92bec3b69f8318d74cd11936a622efef4
parent 50f6417317f9e327ed76abaf34512370f8376245
author Tianjie Xu <xunchang@google.com> 1464027340 +0000
committer android-build-merger <android-build-merger@google.com> 1464027340 +0000

Merge "Allow recovery to return error codes" into nyc-dev
am: 50f6417317

* commit '50f6417317f9e327ed76abaf34512370f8376245':
  Allow recovery to return error codes

Change-Id: I4613291b3b4a0c34d5e6999f240465237472302e