| commit | 20dd29a62e749f037df5d9cd9733fe9c2a463af0 | [log] [tgz] |
|---|---|---|
| author | Paul Crowley <paulcrowley@google.com> | Tue Apr 17 14:40:12 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Apr 17 14:40:12 2018 -0700 |
| tree | 54ab7147b523ea96949c699a315c7f22a4c36f4f | |
| parent | ab3e21fb64c314e3423a794d5f25b1aabc906b1b [diff] | |
| parent | d88d56ae86afc571f8896d293f2af62aaa9411fe [diff] |
[automerger skipped] Merge "Re-land "If enablefilecrypto or init_user0 fails, reboot into recovery."" into pi-dev am: e58d713e47 -s ours Change-Id: Ie0f65f6eed192aaaeb0c8da16f8734e7fbf1cef5