tree 5bac63897a390c1ddebec7eb45cf5d147472e16e
parent f1f6d941b7ed087adf4174806145a9ce3f23773b
parent 77bec6bc61fdae31c0750c11ae1367e20874c81a
author Robert Shih <robertshih@google.com> 1593453473 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593453473 +0000

[automerger skipped] Merge "clearkey hidl: fix oob read in decrypt" into pi-dev am: f1307ef283 -s ours am: 53f1ece56c -s ours am: 930d2d7f78 -s ours am: 77bec6bc61 -s ours

am skip reason: Change-Id I27b05479202e0caedfd052c683aa1ef187f65679 with SHA-1 9adaa6b87f is in history

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

Change-Id: I8d00d99657b51e7ae73bafbfbe697c609072f518