tree 3b9ea34febf4940d7caef5418d9eb742d56b97c1
parent d23ed625fc2884ad67d75c977dce5838d3a81ee1
parent 4f0d5891f1e4452f015d51e55624a2a40a3aed25
author Xin Li <delphij@google.com> 1599789777 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599789777 +0000

[automerger skipped] Merge Android R am: b4eab38de6 -s ours am: 4f0d5891f1 -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: I9c7563c29c4f78882c84695aa5a1521130822b57