tree 3b9ea34febf4940d7caef5418d9eb742d56b97c1
parent c6d76509b96d2124788a5479e758cb8933e02fc0
parent 42318db5e9d60a7f8eb9512188af86d38bed734a
author Xin Li <delphij@google.com> 1599795228 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599795228 +0000

[automerger skipped] Merge Android R am: b4eab38de6 -s ours am: 4f0d5891f1 -s ours am: 42318db5e9 -s ours

am skip reason: Change-Id I5d60cc1d7aab23ff51c3592a5bac3d4e8dcbb87d with SHA-1 6da222fc09 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/1422441

Change-Id: I1e30619926f0eeb4f389af6bb3d589b725ed9326