| commit | ea2f852970c34faa8cf24e75139b678e07b15d42 | [log] [tgz] |
|---|---|---|
| author | Janis Danisevskis <jdanis@google.com> | Wed Apr 07 22:55:05 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 07 22:55:05 2021 +0000 |
| tree | fbc141b26c94a20b758372e9d0d9ba6f07292b84 | |
| parent | e58291f451ef0fab6e9e9eeda1d077b5b5880205 [diff] | |
| parent | 0f1ec32d35847d9c9df78db47a8f668717b8cf43 [diff] |
Merge "Keystore 2.0: Add SensitiveData annotation." am: 0f1ec32d35 Original change: https://android-review.googlesource.com/c/platform/system/hardware/interfaces/+/1643023 Change-Id: Iec11274a301f31a5a2783dd341877d561e59829e