| commit | b71bc8db1523a5d492000298d05014a580f07748 | [log] [tgz] |
|---|---|---|
| author | Edwin Wong <edwinwong@google.com> | Fri Apr 02 23:15:08 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 02 23:15:08 2021 +0000 |
| tree | d10718de548c8e43971753876c587731106eaf5f | |
| parent | 8b77104cac0930c3ce8188faa997a41078cde6ba [diff] | |
| parent | 56af5904c128b2e41f4bc95948e3e1137c43a537 [diff] |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix UAF in clearkey service's MemoryFileSystem" into qt-dev am: 6889557362 am: b68392b02e -s ours am: 78cc122909 am: 56af5904c1 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13711823 Change-Id: Iecdf09a330672181dd3c94e1522036df84e4ea7d