tree 609fd0b91916e2e4464452954c202cc73979e8fd
parent 168985a8113ae3f9cd8cb8a6eb618ff22fce72ba
parent aaadd384e988311f8242d79ba7d8d6e0743ee44c
author Junyu Lai <junyulai@google.com> 1620013818 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620013818 +0000

Merge "Add doc to getNetworkCapabilities" am: bf213ad25f am: aaadd384e9

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

Change-Id: Iab7908bbeb3fd58599d7702e44450a4224a78f5b