| commit | e65f2d8dbd6de59754f7449e455ea5d5b031d40e | [log] [tgz] |
|---|---|---|
| author | Edwin Wong <edwinwong@google.com> | Tue Jul 13 22:46:32 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 13 22:46:32 2021 +0000 |
| tree | dc5534d169e2fd25fba71ba182a9a12f719dea6b | |
| parent | 591dcf6737aa30a7b30a18cf3b4feba47ae63e6e [diff] | |
| parent | 33715c293770bb36d855a62df797edb72066e473 [diff] |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix clearkey CryptoPlugin use after free vulnerability." into pi-dev am: 85c8c0aa0b -s ours am: c4c8ea3c86 -s ours am: 7057eb5586 -s ours am: 4e372600ba -s ours am: 33715c2937 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13391364 Change-Id: I0f09bd82a5b628fb53e9d98d71f8fdae5be3f08d