Merge changes from topic "am-62cf96e558d742ccab9d58387a2cabd1" into rvc-d1-dev-plus-aosp

Browse Source

* changes:
  [automerger skipped] Merge changes I2431a6d2,I9096969a,I748bd9de,Ia5387ca2,I803bdec8, ... into rvc-dev am: 5add803be8 am: 6f8db1afdd -s ours
  [automerger skipped] Simplify unregister logic for Connectivity Diagnostics callbacks. am: 982013743b am: f3cc967bc6 -s ours
  [automerger skipped] Clarify comments for Connectivity Diagnostics reports. am: 95a98c2efd am: 412cbc8760 -s ours
  [automerger skipped] Sort administrator UIDs for NetworkCapabilities. am: 93c1e656b5 am: 2bf058b202 -s ours
  [automerger skipped] Add combine() and equals() for NetworkCapabilities admin UIDs. am: 981dccab03 am: ea9699a505 -s ours
  [automerger skipped] Use IBinder as key for ConnectivityDiagnostics storage in CS. am: 4600fa52a6 am: af15704e32 -s ours
  [automerger skipped] Decrement networkRequestPerUid when callbacks are unregistered. am: 13564eedd5 am: c3f92fbdce -s ours
  [automerger skipped] Invoke onConnectivityReport on registering ConnectivityDiagnostics. am: 560eb2655b am: 9b95f41038 -s ours

...

This commit is contained in:

Automerger Merge Worker

2020-04-01 01:41:44 +00:00

committed by Android (Google) Code Review

parent de9e6ed005 01bdb427e3

commit 4d977980c6

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