tree 7f608dfd75ef6564e43f065a1bba3947a3540d14
parent b481b9cef35dbb45946ae616de7fbc82ff26a2f2
parent 59d89299c9cd165deb1291db88d18e6bc410717f
author Junyu Lai <junyulai@google.com> 1620012862 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620012862 +0000

Merge "Add doc to getNetworkCapabilities" am: 59d89299c9

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

Change-Id: I81c764ca04e3a300272ba18faa35d9fb0ecb54b1