commit | 1617a07d361099ede50e17e0ca7655135e7520c6 | [log] [tgz] |
---|---|---|
author | Paul Crowley <paulcrowley@google.com> | Fri Mar 02 01:54:26 2018 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Mar 02 01:54:26 2018 +0000 |
tree | 6a9c7670442771c3436455d509c8a0b9713d7dd1 | |
parent | bc0e52d2b7535ef126a5c45576b91f19e7d9baa4 [diff] | |
parent | 73a3c271c3ff63f78f3fe46285ace13822a1e314 [diff] |
Merge "Revert "If enablefilecrypto or init_user0 fails, reboot into recovery."" am: b9ee9abebe am: c30557f2bf am: 492ff5bf09 Change-Id: I4218d302b0924e162c64929f6b69d0a28f6fac4f