| commit | c65c4ac28dce4b995575cf00e882e1befe3c2171 | [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 | af0e051bc4ad581a900f8681f2f83a119fa30346 [diff] | |
| parent | e4fd8766a24e91aca0a683a35ebce4aff6e949a1 [diff] |
Merge "Ask the user before wiping if crypto policy fails." am: 1d5965e40f am: da7fe657d3 am: 03d099c81a am: e4fd8766a2 Change-Id: If3bdf6fbebb21ad06901fd313b7a0e558235b77a