tree b4a5138a77e39f51537bf84c578e1492b7c9aa87
parent c3892c045ff82d57b9e584acdf32a2d7e1652f33
parent e242a97db547dc73efea1b5287536be66637dc33
author Treehugger Robot <treehugger-gerrit@google.com> 1519953992 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1519953992 +0000

Merge "Revert "If enablefilecrypto or init_user0 fails, reboot into recovery.""