| commit | ad1cd95c10e3b222241056ebcb2a07abd7d6146e | [log] [tgz] |
|---|---|---|
| author | Jean Chalard <jchalard@google.com> | Tue Dec 14 11:33:01 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 14 11:33:01 2021 +0000 |
| tree | d3313496833366fe0d4a1615714cf20fe0e4603b | |
| parent | 1b29dd3d2b433cf8476b0dd1f79e24cba1c51417 [diff] | |
| parent | d5c9c3f4aebfcfd6487920b1de663b8beb097196 [diff] |
Merge "Remove NetworkCapabilities#combine*" am: 5469fa6e59 am: d5c9c3f4ae Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1919248 Change-Id: I6eccebda7c8c6ee9265bd06addb72a5e7fd56d3f