commit | d7d627ef8b80ce882ca60c5ea681ef8ba94e3019 | [log] [tgz] |
---|---|---|
author | Paul Crowley <paulcrowley@google.com> | Fri Feb 16 01:24:24 2018 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Feb 16 01:24:24 2018 +0000 |
tree | 714b1591830ce3fddb6aa75ff14858f06dff607d | |
parent | eb7585950eb4ddc58ceee953f418d14aa005741d [diff] | |
parent | d24e7f8647acd679e66c7f697f797618ca4cbcce [diff] |
Merge "If enablefilecrypto or init_user0 fails, reboot into recovery." am: 851803d3cf am: cc3e825100 am: d24e7f8647 Change-Id: I06ac64c1e260a4a3d45d8acdf4fec5c0bdeedb21