[automerger skipped] Merge "Revert "Correct the logic in... (38f4abd6) · Commits · Android-smartphones / realme / realme 5pro / kaderbava / evolution_frameworks_base

Commit 38f4abd6 authored Mar 22, 2021 by Chiachang Wang Committed by Automerger Merge Worker Mar 22, 2021

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

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

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

Change-Id: I0317175e5c25616addd0b651d48ce47d61503f00

parents 8ed5c556 67ab7d7e

Hide whitespace changes

Inline Side-by-side

Please register or to comment