commit | 7007e04119e4d5e3b5c56d58495b1dd46fbf292d | [log] [tgz] |
---|---|---|
author | Chiachang Wang <chiachangwang@google.com> | Mon Mar 22 07:37:17 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 22 07:37:17 2021 +0000 |
tree | 11e745fc5e72bdfa2625578f5bb28c0c23325002 | |
parent | d914ad7ad95a98e056551c974e87d89c42bddebd [diff] | |
parent | 60450deb675162d7a7636376f704ec0804a839e3 [diff] |
[automerger skipped] Merge "Revert "Correct the logic in NetworkCapabilitiesTest"" am: 3f603fae13 -s ours am: 60450deb67 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645005 Change-Id: Ifa4c6a30dfec86d8860c365b3f4b343599ab3524