commit | 67ab7d7eb07bfb0ca595b1990fc869c9b6ac4ecb | [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 | c39803678c57bd3edf67edcd8c7b4110854783ec | |
parent | c000e910479acb12a0494b910420e5d7d35dff4c [diff] | |
parent | 0e1deb15209cc096ece72984c9235d1a8001f824 [diff] |
[automerger skipped] Merge "Revert "Correct the logic in NetworkCapabilitiesTest"" am: 9f1cd40748 -s ours am: 0e1deb1520 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645005 Change-Id: Ifa4c6a30dfec86d8860c365b3f4b343599ab3524