| commit | dd836048142dcb3fac8ea04793441973e0d4ac4a | [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 | d5678ea4a62a8dfbf9085d8203c2a709f9c09fbb [diff] | |
| parent | 774ea21c71fb1a51192fb565097c3f721e5d3354 [diff] |
Merge "Ask the user before wiping if crypto policy fails." am: 1d5965e40f am: da7fe657d3 am: 03d099c81a Change-Id: I07a104cf94bced793bd6d81fd37193f09c32d061