[automerger skipped] Merge "Update setSubscriptionOverride API to allow network types" am: 1c600eed49 am: 3cde1b28c9 -s ours am: 1a99c16d7c -s ours am: baab776860 -s ours

Browse Source

am skip reason: Change-Id Ie196db5e236e478f1c29c3dfd1ca31acc205c54b with SHA-1 9762f014fa is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I20f741144cfd9369beda06ca0d3cb34d3fc780c0

...

This commit is contained in:

Sarah Chin

2021-02-05 07:30:13 +00:00

committed by Automerger Merge Worker

parent 06f5835e3d baab776860

commit 2d5acc7023

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