tree 5bac63897a390c1ddebec7eb45cf5d147472e16e
parent 3aae8d078d455a4b2eb7805df8407d3c8954b428
parent 3778ba122ff9514a515c3cd5fe367bff6a03184e
author Robert Shih <robertshih@google.com> 1593454403 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593454403 +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 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: Ia752e448f83c30503185a19ac65572688b82e51b