| commit | 03d099c81aa8315aa103f18922afd44eabab0fdc | [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 | da471bc6e2dd17b7783dc4c5c2e2026c48b916ef [diff] | |
| parent | da7fe657d35d6bb2c05c81ea66954c0149360355 [diff] |
Merge "Ask the user before wiping if crypto policy fails." am: 1d5965e40f am: da7fe657d3 Change-Id: I2279059f1c291cfab3b44bff6b1f05669bd3af99