tree 8c228de05a7ab31d50198921e40eaa232b6f8fdd
parent 2534f6b9163f6e7ee8546dc17ba95f3774726619
parent 026c310600382ac12322279cdfe131fe340cf4e5
author Junyu Lai <junyulai@google.com> 1620014794 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620014794 +0000

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

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

Change-Id: I0c41878350ffe4015fe9e6034651f50366503dfe