tree aa1adeaaba3525b8ea3d11b8165d98872bef6c0e
parent c6536c87944fa31796e8069fed582c23140bf32e
parent 906fe717a0a63453bb615931505c495029a553c8
author Anton Hansson <hansson@google.com> 1606828204 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606828204 +0000

Merge "Remove WifiApiServiceInfo" am: 906fe717a0

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

Change-Id: Ib7b865dadb486096af32ebf4e634bad07e813fa5