tree fb1372804c84ec048ddb410af9deff96af6b5632
parent 88ed75935fcc99cae1bf9db336071d89c721c314
parent df3055d2ec18f858f60029a9290d8ba00dc1989f
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1581619834 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1581619834 +0000

Merge "Make test for hardware AES support explicit." am: df3055d2ec

Change-Id: I7c117d6454af4abcad4ceb1f73d7a4e26d5b003f