| commit | 304eed2acbdb5051024c824e860c0b64b4b50116 | [log] [tgz] |
|---|---|---|
| author | Paul Crowley <paulcrowley@google.com> | Tue Apr 17 10:07:39 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Apr 17 10:07:39 2018 -0700 |
| tree | eba8f5de2432fa9cedec95dfa527844902468eaf | |
| parent | 234d45f06e79cafa0b95a1b1ebc640ab04ab8766 [diff] | |
| parent | 2f225f40aae8dd627206c083eb2b7dddf53ef2f8 [diff] |
Merge "Re-land "If enablefilecrypto or init_user0 fails, reboot into recovery."" am: ca10ecb3ae Change-Id: Ib906e393d8d2226083f23503c7eb1f96c58bbcf1