Skip to content
Commit 089fd978 authored by Daniel Bright's avatar Daniel Bright Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Add CAPABILITY_ALLOWED_NETWORK_TYPES_USED" am:... 

[automerger skipped] Merge "Add CAPABILITY_ALLOWED_NETWORK_TYPES_USED" am: 9816c0ce am: 248a6207 am: 604c3e28 -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id7c8732e7e1e6c504f0ffd2dc17053adc0030fab
parents c8609a5a 604c3e28
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment