commit | cb227c576f998857a9630f378661c817beb18baf | [log] [tgz] |
---|---|---|
author | Frank Li <lifr@google.com> | Tue Mar 30 11:17:04 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 30 11:17:04 2021 +0000 |
tree | 6eec56b16abebfd406ae310f01acd3a04fcf31fd | |
parent | a2073df7148c64c2bdd1c560ff5e562680fe29d4 [diff] | |
parent | de5f2ea135adec894a7751a706c326a30d9770f0 [diff] |
[automerger skipped] Merge "[JS02]Remove hidden API usage of NetworkRequest.networkCapabilities" am: 3eee37a29d am: 734f12bce1 am: f67b44d88f -s ours am: de5f2ea135 -s ours 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: If1baf6856a2915d56ed3f3607a3eaa7965a64c7e