tree 7f608dfd75ef6564e43f065a1bba3947a3540d14
parent 7d4cea500581618937b3e2e2083f5a705208221f
parent 622e129d00cfe13db37c1eb56c1802e73dc69c6f
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: 59d89299c9 am: 622e129d00

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

Change-Id: Iab7908bbeb3fd58599d7702e44450a4224a78f5b