| commit | 774ea21c71fb1a51192fb565097c3f721e5d3354 | [log] [tgz] |
|---|---|---|
| author | Paul Crowley <paulcrowley@google.com> | Thu Dec 22 16:03:26 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Dec 22 16:03:26 2016 +0000 |
| tree | c0fb4651e3cb47f2c5d96844ad9ecd170e4b4436 | |
| parent | a4a57be2a7cd081b6e2b0ba17bb7edc7ea121278 [diff] | |
| parent | f2e87ae465c01134bb8ebd4396f7dce9adf29fe2 [diff] |
Merge "Ask the user before wiping if crypto policy fails." am: 1d5965e40f am: da7fe657d3 Change-Id: I2279059f1c291cfab3b44bff6b1f05669bd3af99