tree 3390ce7b6a5e9f624a24a526cc8f431740bd6ad9
parent 51ab47ec289591c8074c893177e1d487cfff1f08
parent 3139f6d12c147b42b1f8c001d65df951aaa62fd0
author Baligh Uddin <baligh@google.com> 1608819259 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1608819259 +0000

[automerger skipped] Migrate frameworks/base/wifi & frameworks/base/packages/OsuLogin am: 3139f6d12c -s ours

am skip reason: Change-Id Id02e28648e922a30d6a81cf92b39eff4ca3cc002 with SHA-1 09fdba4271 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9e14ba65f614f2da1205ddf946677ce9482fce6e