Skip to content
Commit 8ed5c556 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Correct the logic in NetworkCapabilitiesTest" am:... 

[automerger skipped] Merge "Correct the logic in NetworkCapabilitiesTest" am: efbd8b39 -s ours am: 64169ae2 am: c000e910

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

Change-Id: I52d135904ffc8cb4aae0166deb7bfaedc969a583
parents 0f71cd37 c000e910
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