tree 716971a1a7bfb8028d9d9eebb9f25d3669fc40c1
parent cbf9c1581e87345146bac37084bd2414d573b469
parent cb474fd2d248eb4446ec169cfff5ce65162bdb53
author Anton Hansson <hansson@google.com> 1606831691 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606831691 +0000

Merge "Remove WifiApiServiceInfo" am: 906fe717a0 am: b0b08331f4 am: cb474fd2d2

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

Change-Id: Icb7da08d621a115bd098cf9384ebd72e2bbfdcc0