| commit | 9bb6564c95ce8e297e4d29b7afe06374056332e0 | [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 | 91a5ab494709f620b92edb9ed7e18d590159a149 [diff] | |
| parent | e58d713e47bc798a546c3d2a2c40e2339527133d [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