tree 2cdf84c3211e8208d5e802746056247f13fd3528
parent 787256cf91029fac02e6656755b6a9d88f6f78ce
parent dc68043ad08852214fb64986289554e03c09b04d
author Baligh Uddin <baligh@google.com> 1608792643 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1608792643 +0000

Merge "Migrate frameworks/base/wifi & frameworks/base/packages/OsuLogin" am: e41cd2917a am: dc68043ad0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie2588d9be48b50d41aaf5a5440268bb377081242