[automerger skipped] Merge "Revert^2 "Add CAPABILITY_ALLOWED_NETWORK_TYPES_USED"" am: cc318221a5 am: 9c4102e2a1 am: b50587319e -s ours

Browse Source

am skip reason: Change-Id Ie31d32a08b10b8c125f27832e81a3e65b6d8767a with SHA-1 e177c09787 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id3effe377205a2a1b37eceb2ec978af31d98f23f

...

This commit is contained in:

Daniel Bright

2021-03-01 08:03:08 +00:00

committed by Automerger Merge Worker

parent 60891de142 b50587319e

commit d3cfb31078

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