tree d2ec68807b2e59cae5c3fa809e330f7fc1b0977f
parent 7a5be5533b601ae072f2469a3c34534102d181f5
parent fb4a3fc11555f4390e82f28011b31ca4b48e8743
author Les Lee <lesl@google.com> 1597384690 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597384690 +0000

Merge "wifi: Support SAE_TRANSITION when converting to WifiConfiguration" into rvc-qpr-dev am: bae844a14d am: fb4a3fc115

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

Change-Id: I8f449394698cf25a093e4ca0c8de495a900b27d7