tree 15dc93cc5533bbef78b6ae716a90f52008ac4790
parent c407689f12d96ddb25ca580ad3a0f7bb0608d895
parent 737529ea941654085786bb60153466f324ff938f
author Treehugger Robot <treehugger-gerrit@google.com> 1608658778 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1608658778 +0000

[automerger skipped] Merge "Split updatable/non-updatable Wifi APIs into separate directories" am: b8b8a392f3 am: 7cd4021230 am: 737529ea94 -s ours

am skip reason: Change-Id Ia95e300da9286d79ee57c285c3bfa88ecc98e326 with SHA-1 e7cc3ae663 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie61262ddf5de547fd0606029ecbaed5182adc45e