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

[automerger skipped] Merge "RESTRICT AUTOMERGE: Camera: fix stream ID for failed buffer request" am: d64b467c29 am: cbca71fbcd -s ours am: 1cf0f39ad3 am: dbdf63369a

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

Change-Id: I2f63db18e47877b7b8ba37b39c051460980bfce8