| commit | 99e58aa547f136486deba813ed962cb214ecb80e | [log] [tgz] |
|---|---|---|
| author | Kris Alder <kalder@google.com> | Tue Jun 09 15:18:29 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 09 15:18:29 2020 +0000 |
| tree | 9a53951dfb0655297b02a18beb9fc79d3e815ba7 | |
| parent | 9f671f88962c03342390e7b575ff5a3f52edfe48 [diff] | |
| parent | 19ab5683791dc9292598afcff0afbd132fbc3d53 [diff] |
[automerger skipped] Merge "Crash the process when midi extraction times out" am: 3723513e49 -s ours am: 19ab568379 -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: I2692f253cf0760d48ca7cdd53c59e026c069f4e6