tree e5c460df3a5da7dda8c4b0083a4a18236fa0400b
parent a69d2280fc97438097e1854926bf9b10c1992cb4
parent f212a922e98906ae6472c617314c8e2fdb5a930e
author Chiachang Wang <chiachangwang@google.com> 1618237501 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1618237501 +0000

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

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

Change-Id: Ia437814497ef603043980c37add9e2ddfccf11c9