[automerger skipped] Merge "Fix race condition in linearblock release between TIS and MediaCodec" am: 49467f1cdf am: 409784587c am: b4624bfd76 -s ours am: 8b756e725e -s ours

Browse Source

am skip reason: Change-Id I13f924adc3586607eb3a60d184e7786536c7b788 with SHA-1 7bff9d579a is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563873

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib008b7c4cf0896343ab3d0c75810e7e35c3dc484

...

This commit is contained in:

Treehugger Robot

2021-01-29 00:39:35 +00:00

committed by Automerger Merge Worker

parent 22d120e22d 8b756e725e

commit 7a2e18ed24

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available