tree 85d447774ba82b7da906234f078750cea3540d22
parent bf5b6ad38822a1b8983c91ea5da22396b1bc88a7
parent 1671108bf452bcd144ee3dbe6e3c7bc58924ad67
author Hayden Gomes <haydengomes@google.com> 1614130991 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614130991 +0000

[automerger skipped] Merge "Check for disabled camera in MediaRecorderClient" am: 1671108bf4 -s ours

am skip reason: Change-Id I47e8878182fe82c1473da59c8054ee7281efe23e with SHA-1 8087057ba5 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5cdc3fca492c3dc0cc779309aafd3600c19f7dae