tree 01aeb95c48467eb23c05670fa47cf07c12d4d1be
parent 94eb68721f57799a63a3c41471902e2f3f46ddbb
parent 93c4f4cc2d3c34cf7935ea4a61aa9a77e83f3efd
author Frank Li <lifr@google.com> 1623982393 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623982393 +0000

[automerger skipped] Merge "Add CTS test for NetworkRequest.getCapabilities API" into sc-dev am: 799d1c6053 am: 93c4f4cc2d -s ours

am skip reason: Merged-In I8504caa586bdb567d42047a96029dedc67968793 with SHA-1 50d8cd23d9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15013235

Change-Id: I12ee949cc5bc3d1a7ac34656cb1766aab6cf509a