tree 01a35b58247a07beb79379c1a6f0f007350bb608
parent f2fa4adaae47195684ce5f7c20a51e5eee7d1af9
parent b7f922f0034d341547fa69efeb56e70826bebdd5
author Robert Shih <robertshih@google.com> 1593454260 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593454260 +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: b7f922f003 -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: I2d9cdc50b005b3450cbdde4845550576e1d8097b