tree e76f91dd5f29c358ce5cada794ec8d7508d9eafa
parent 9c2a2705c7a882122e921774aaffe9f18a5f731a
parent 95d6ec4a52338e9874d3e5d8bc1aa7cc22a962b9
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: 95d6ec4a52

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie2588d9be48b50d41aaf5a5440268bb377081242