Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 8a430849 authored by Tianjie Xu's avatar Tianjie Xu Committed by android-build-merger
Browse files

resolve merge conflicts of 3aabd770 to nyc-mr1-dev-plus-aosp 

am: 549745cc

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

Change-Id: I474bc0afb4e92ffafec9de60e1665e3aa3c2cf10
parents c466c70d 549745cc
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment