| commit | 492ff5bf09410083f73ca95bcd022133bd2ffcac | [log] [tgz] |
|---|---|---|
| author | Paul Crowley <paulcrowley@google.com> | Fri Mar 02 01:49:18 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Mar 02 01:49:18 2018 +0000 |
| tree | 0309f91b31b0a1ffe9a1841a9219fbfab5f6f9d1 | |
| parent | 54dd80337dcddca4a6c2492542a026f572444c30 [diff] | |
| parent | c30557f2bf70a58b1bac553d8237ad7f50b77baf [diff] |
Merge "Revert "If enablefilecrypto or init_user0 fails, reboot into recovery."" am: b9ee9abebe am: c30557f2bf Change-Id: If87f2af0a0babe02d45353c57d08fd7335cfc2f6