| commit | 18108c114e73c71a057b33f28735a922d82e2b21 | [log] [tgz] |
|---|---|---|
| author | Paul Crowley <paulcrowley@google.com> | Thu Dec 22 16:14:27 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Dec 22 16:14:27 2016 +0000 |
| tree | 8539ef5c314ebad1f69b2e853a60a6f8fb08f4d1 | |
| parent | b6a6a8c6d530a593a5e49a18e6456e2fce02d9cd [diff] | |
| parent | dd836048142dcb3fac8ea04793441973e0d4ac4a [diff] |
Merge "Ask the user before wiping if crypto policy fails." am: 1d5965e40f am: da7fe657d3 am: 03d099c81a am: e4fd8766a2 Change-Id: If3bdf6fbebb21ad06901fd313b7a0e558235b77a