tree bfa6197ae0565f8d61052a212d96c89acdaf1e39
parent c664ed197a4e61aac802de3db6fa2c485c9cb39a
parent 3633ac43f625fe8ccb82eeb56197f3d5ab6cb24d
author Chiachang Wang <chiachangwang@google.com> 1618240466 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1618240466 +0000

Merge "Rename APIs in NetworkAgentConfig.Builder" am: 3cbfc11c93 am: d9feace234 am: 3633ac43f6

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

Change-Id: I1988750dd4b65a3d74c33c8fc120bb3bcb705320