tree 156a356d80ed44957a11bac62920a874bfe225fe
parent 126d179961df2fe9095ae5f00cb710a3071a98a3
parent 2427ea55fab987342129cbf9b78800a05c70e627
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579727006 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579727006 +0000

Merge "Allow ClearKey hal to access allocator hal" am: 4891343a4e am: 8afe36b8a6 am: 2427ea55fa

Change-Id: Ifea98930287fb64cce9f868dc1e487c1fc56ee7f