| commit | f2e87ae465c01134bb8ebd4396f7dce9adf29fe2 | [log] [tgz] |
|---|---|---|
| author | Paul Crowley <paulcrowley@google.com> | Thu Dec 22 15:57:56 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Dec 22 15:57:56 2016 +0000 |
| tree | d63bf11a490bb43b8379e5d967d429cb8822e498 | |
| parent | 9f087ff0b64094adcc428d69e5b0b380c9403355 [diff] | |
| parent | 7330c91a3325a7efce60b71f3f1ac56149873396 [diff] |
Merge "Ask the user before wiping if crypto policy fails." am: 1d5965e40f Change-Id: I93c46878aada1835a1159b54950ce9f8b3fdb777