[automerger skipped] Merge "[JS02]Remove hidden API usage of NetworkRequest.networkCapabilities" am: 3eee37a29d am: 734f12bce1 am: f67b44d88f -s ours

Browse Source

am skip reason: skip tag Change-Id I263d2488472dae21e1cdca3760e0127cc0d20de2 with SHA-1 956383c236 is already in history

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

Change-Id: I1e689f36bdf30726017e4f6d89d6beabbdd598f7

...

This commit is contained in:

Frank Li

2021-03-30 09:44:37 +00:00

committed by Automerger Merge Worker

parent 20dd1b7fd5 f67b44d88f

commit de5f2ea135

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available