tree e5c460df3a5da7dda8c4b0083a4a18236fa0400b
parent 89edca00d14797b8480cb407cde421569bf0ea3d
parent 378608317605860a004c2d781dc4730bf320031b
author Chiachang Wang <chiachangwang@google.com> 1618238866 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1618238866 +0000

Merge "Rename APIs in NetworkAgentConfig.Builder" am: f212a922e9 am: 3786083176

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

Change-Id: Ia16a26e64e65687faf6303c392c4a85de52129e3