| commit | c4c8ea3c868dd3f27a755bf71788afd9d6cf5ea1 | [log] [tgz] |
|---|---|---|
| author | Edwin Wong <[email protected]> | Tue Jul 13 21:28:53 2021 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Tue Jul 13 21:28:53 2021 +0000 |
| tree | adf15ece86df8449d950cfd74ddd371c1e076a06 | |
| parent | 0b4d5dfdc960ad47f09d8d955c84c57214cb11c6 [diff] | |
| parent | 85c8c0aa0b6cb7d58f681b764908fdb4ba185f0e [diff] |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix clearkey CryptoPlugin use after free vulnerability." into pi-dev am: 85c8c0aa0b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13391364 Change-Id: I903515f98137f78efebf3d048c6f105ac851391a