tree e76f91dd5f29c358ce5cada794ec8d7508d9eafa
parent d095d82c8510bfce3f1f75968dc21587009f5db8
parent 67ba9e1d662676dbe7dd1e810e0eec3c4be179b7
author Baligh Uddin <baligh@google.com> 1608791218 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1608791218 +0000

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ief078339fcd28ea8899eceec6ec611429c30a2ae