tree 72c48ff043a06efbb2efda04e993eda0ec33f6eb
parent ffbffd49b982f27f502f28449820acefa80cb281
parent 4456b911789969ac0a6aee4b304676c29a120ac3
author Robert Shih <robertshih@google.com> 1568152762 -0700
committer android-build-merger <android-build-merger@google.com> 1568152762 -0700

[automerger skipped] [RESTRICT AUTOMERGE] clearkey hidl CryptoPlugin: security fixes am: 5dd7590c6c -s ours am: 15437f1e00 am: ef6506d2c5 am: f06897b16e
am: 4456b91178 -s ours
am skip reason: subject contains skip directive

Change-Id: I731c4e3eae623da91c1ccb97e57d8137d93c2a50