commit | d362bd0e16769cde4a09c6923bce7bae96c3bed2 | [log] [tgz] |
---|---|---|
author | Hasini Gunasinghe <hasinitg@google.com> | Mon Aug 10 15:57:42 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 10 15:57:42 2020 +0000 |
tree | 4c87f069648ad292956e11f48b57578bd4a12a66 | |
parent | 1a306394c9a31e3eb3ed6340affdf6e816523df3 [diff] | |
parent | 67a96b1a038db37dab744ac03d6d2d0e0c4dc9fd [diff] |
[automerger skipped] Merge "Add KeystoreKeyEventReported atom for keystore logging." am: d64ab1853d am: 7896d08fec -s ours am: 67a96b1a03 -s ours am skip reason: Change-Id I66fbc2b8ed98a34f243387f8550b6523b13cb9a2 with SHA-1 7c336a66d9 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1316774 Change-Id: I158f53e4d87089a30e152b72cf7e6fc7949ab6db