| commit | 422376ded9d89fd7c980d40ff5f7d7a82344dc0a | [log] [tgz] |
|---|---|---|
| author | Dan Stoza <stoza@google.com> | Tue Apr 25 22:21:13 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Apr 25 22:21:13 2017 +0000 |
| tree | b048f6a9e8bb5c0861a0f8836d402e6e4c21f2fc | |
| parent | ee9240621d40c5639d16a69dbaa94198824532a2 [diff] | |
| parent | 9ab834a4e681489030a56d2454de42e98108d363 [diff] |
Merge "Revert "Fix temporary key deletion after device ID attestation"" into oc-dev am: e3b7240bf5 am: 9ab834a4e6 Change-Id: Ic39f5335dbbc01b4400e154a5e1e3ee8a61d6564