tree 01a35b58247a07beb79379c1a6f0f007350bb608
parent 20f0cfd5c035657de1b2f547199693fb75d4b596
parent f2fa4adaae47195684ce5f7c20a51e5eee7d1af9
author Robert Shih <robertshih@google.com> 1593454782 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593454782 +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: 3778ba122f -s ours am: f2fa4adaae -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: Ia68a203a5633c7ba9658a22238308d792f181b94