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

[automerger skipped] Merge "Revert "Correct the logic in... 

[automerger skipped] Merge "Revert "Correct the logic in NetworkCapabilitiesTest"" am: 9f1cd407 -s ours am: 0e1deb15

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

Change-Id: Ifa4c6a30dfec86d8860c365b3f4b343599ab3524
parents c000e910 0e1deb15
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