| commit | cd1821a8912b3ee3eee4f9cc79123e1c48c0abce | [log] [tgz] |
|---|---|---|
| author | Kris Alder <kalder@google.com> | Tue Jun 09 15:34:24 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 09 15:34:24 2020 +0000 |
| tree | 9a53951dfb0655297b02a18beb9fc79d3e815ba7 | |
| parent | 416369f41e7fd6138ce06a86f77ae69c017bf415 [diff] | |
| parent | 99e58aa547f136486deba813ed962cb214ecb80e [diff] |
[automerger skipped] Merge "Crash the process when midi extraction times out" am: 3723513e49 -s ours am: 19ab568379 -s ours am: 99e58aa547 -s ours am skip reason: Change-Id I8d2fd85f91d1d2749c5620cf8518583076d2f6d7 with SHA-1 166a84bfe3 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1325718 Change-Id: I68631b479195280adacff536883c742104ad99bf