tree 0e26e0897d9521a76279e8a7d03e1cf0fb0fea42
parent 2a2cd515955bf150903c7414268dd2441af44a8d
parent 07f94fbb0145400c22befafde8068bd22704f77e
author Treehugger Robot <treehugger-gerrit@google.com> 1612587129 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1612587129 +0000

Merge "Keystore 2.0 SPI: Add NAMESPACE_WIFI." am: 07f94fbb01

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564075

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2bfc7b67e43d50c7064d961b7ede3f3a2ad1d7f0