Skip to content
Commit 084f3b83 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge changes from topics "nonAutoIPSelection", "preferredIpProtocol" am: ec59bee3 am: a7083f38 

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



Change-Id: Ieeccf8c21357d2f16a00cf183b0a69f78b917f6e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 591a5d48 a7083f38
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