| commit | da7fe657d35d6bb2c05c81ea66954c0149360355 | [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 | 342276b4286cf8688f3ec38b52d0526787e81a7d [diff] | |
| parent | 1d5965e40f33331094cb55957d6f2e0c2295c550 [diff] |
Merge "Ask the user before wiping if crypto policy fails." am: 1d5965e40f Change-Id: I93c46878aada1835a1159b54950ce9f8b3fdb777