commit | 60c555998cb2f154beab9c7115e7c472c7f0e001 | [log] [tgz] |
---|---|---|
author | Yin-Chia Yeh <yinchiayeh@google.com> | Tue Jul 14 23:00:14 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 14 23:00:14 2020 +0000 |
tree | 5d9cbd5440ec2b7388176e48861c28ea1050f28b | |
parent | a382cec0af839a184520c2986cd6281928e8eacf [diff] | |
parent | ef2f7cfe4d1d45ada29e6ef844961738715ccee0 [diff] |
[automerger skipped] Merge "RESTRICT AUTOMERGE: Camera: fix stream ID for failed buffer request" am: d64b467c29 am: cbca71fbcd -s ours am: 1cf0f39ad3 am: dbdf63369a am: ef2f7cfe4d -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1361250 Change-Id: I85c85757c245f1f315e8ef30d274ba9ac4e1dcb4