tree b63d6819065b00e3ba3d807218f1e57f1471ff26
parent ea2e787ba449015e741eec9391a85b0aa37b7b31
parent a14b455ec91f34d5548b389300d7dddbcf1da32f
author Xin Li <delphij@google.com> 1602209418 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602209418 +0000

[automerger skipped] Skip ab/6749736 in stage. am: a14b455ec9 -s ours

am skip reason: Change-Id I26c57e6419abe6f812ca7c3003f6977fafa60cfb with SHA-1 3438fd95ab is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/12796094

Change-Id: Ifa1bd395c9e5d1b595536c9c67f3c27ba165960b