tree 18d9ab7f6dab1b243cb24edf4dd2c720aa64cc34
parent 95ab8f958942e50ad7cbc4f8d5440342888e9a0c
parent f096eca2412d1655c72d6e047025f791cd436797
author TreeHugger Robot <treehugger-gerrit@google.com> 1594847694 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594847694 +0000

[automerger skipped] Merge "Camera: fix stream ID for failed buffer request" into rvc-qpr-dev am: 127b0dba8a am: f096eca241 -s ours

am skip reason: Change-Id I70d3c3d8c77b7a4568d893bc19f4b3acecdd2684 with SHA-1 2012653391 is in history

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

Change-Id: Idd5047aeacaeca02bd415467c960488989d29cc1