| commit | cfd9f9ca3e4b3a77b93198839c0bdd05fd53e783 | [log] [tgz] |
|---|---|---|
| author | Paul Crowley <paulcrowley@google.com> | Tue Apr 17 12:14:26 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Apr 17 12:14:26 2018 -0700 |
| tree | 5593d9477dc7dda547dc99f22bb9c2adec1ddc08 | |
| parent | 823c460f637567fb8a8d73599dd3af7a3755a0f1 [diff] | |
| parent | 304eed2acbdb5051024c824e860c0b64b4b50116 [diff] |
Merge "Re-land "If enablefilecrypto or init_user0 fails, reboot into recovery."" am: ca10ecb3ae am: e72619c947 Change-Id: I739a56c5d1a5508b6ccc45710f4f2bc32fefa86e