tree b63d6819065b00e3ba3d807218f1e57f1471ff26
parent 6afe49bd79cdd2c64ea7d1bf748e6ce93fee9419
parent 40880c91b9568ac8f9601e5d7bdb6fe47e64532e
author Xin Li <delphij@google.com> 1602210918 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602210918 +0000

[automerger skipped] Skip ab/6749736 in stage. am: a14b455ec9 -s ours am: 40880c91b9 -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: I18fd2a994c73311da4dbc58fff89a4805d53df8e