tree 5d9cbd5440ec2b7388176e48861c28ea1050f28b
parent cb7e4189cde70020917a928e6843154d1ad5edbe
parent 23b67f29e83fa5d4b33fe8f157df8bdb3a187128
author Yin-Chia Yeh <yinchiayeh@google.com> 1594767612 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594767612 +0000

[automerger skipped] RESTRICT AUTOMERGE: Camera: fix stream ID for failed buffer request am: ee2d104677 am: eb83a2b74e -s ours am: dca19c39d3 am: 0e3e6e3966 am: 23b67f29e8 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1361250

Change-Id: I489aa70aa1ab30646c2bc1ac32f72c52f4ae7a61