commit | 38f4abd6b35797984af3d1b89844163dcbab3331 | [log] [tgz] |
---|---|---|
author | Chiachang Wang <chiachangwang@google.com> | Mon Mar 22 12:33:45 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 22 12:33:45 2021 +0000 |
tree | d461e661cf790907210a66f994926530852385a6 | |
parent | 8ed5c55633211716c46c15331537a3ed82c0910f [diff] | |
parent | 67ab7d7eb07bfb0ca595b1990fc869c9b6ac4ecb [diff] |
[automerger skipped] Merge "Revert "Correct the logic in NetworkCapabilitiesTest"" am: 9f1cd40748 -s ours am: 0e1deb1520 am: 67ab7d7eb0 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645005 Change-Id: I0317175e5c25616addd0b651d48ce47d61503f00