tree a725aeb786d14b7f60e0a2f229e8a3553b0f85e7
parent 9f5ce3875917e370a2bbb2af47d9fbe7affa19ba
parent fca58067a31c3d62ac7424d36fca65d06c918b47
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1581465445 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1581465445 +0000

Merge "neverallow: update for different HIDL build." am: 226adf28ae am: b19df54d94 am: fca58067a3

Change-Id: I84768c6ed509940af3fb6fb4eb8a9cb8c3cff5f2