tree 959dcb6abb6d249720c524754f63983099a081e0
parent 1ea3c05cd2911c471d95326be4771840a9585ca9
parent 63ce8c3ea7977c3fd22a76173df14f2e43fbe45f
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583210722 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583210722 +0000

[automerger skipped] New NetworkAgentConfig API to replace NetworkInfo WiFi stuff. am: 490e292a76 am: 1cb0560dc2 -s ours am: b9734d68d5 -s ours am: 9f9333a1ef -s ours am: 63ce8c3ea7 -s ours
am skip reason: Change-Id Id13fcf41e05fd1eb26c86717e2684c724b94e401 with SHA-1 138271c795 is in history

Change-Id: Ic1f1318abd225fc5fbf849d883a75d14e72d6d56