| commit | e4fd8766a24e91aca0a683a35ebce4aff6e949a1 | [log] [tgz] |
|---|---|---|
| author | Paul Crowley <paulcrowley@google.com> | Thu Dec 22 16:08:57 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Dec 22 16:08:57 2016 +0000 |
| tree | c0fb4651e3cb47f2c5d96844ad9ecd170e4b4436 | |
| parent | f855e293759e9427c4635b86f979581a39300111 [diff] | |
| parent | 03d099c81aa8315aa103f18922afd44eabab0fdc [diff] |
Merge "Ask the user before wiping if crypto policy fails." am: 1d5965e40f am: da7fe657d3 am: 03d099c81a Change-Id: I07a104cf94bced793bd6d81fd37193f09c32d061