tree 9e9ef8b5d26750423676a73444c64ba5d71532f3
parent ab90190dda67557f8c532b2655bc2312070a2d9b
parent dc97e3e091b404b23e7fe919b30e523565f3b1ce
author TreeHugger Robot <treehugger-gerrit@google.com> 1523997254 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1523997254 +0000

Merge "Re-land "If enablefilecrypto or init_user0 fails, reboot into recovery."" into pi-dev