| commit | adb8328ed1f6da23f013484e38cca7fe2521ab54 | [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 | 4631f35cdb975b116dec47d73a4a4fb7f172595f | |
| parent | 0f324fc00571e2a421cd38ab1caeedb6e20c2732 [diff] | |
| parent | 7007e04119e4d5e3b5c56d58495b1dd46fbf292d [diff] |
[automerger skipped] Merge "Revert "Correct the logic in NetworkCapabilitiesTest"" am: 3f603fae13 -s ours am: 60450deb67 am: 7007e04119 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645005 Change-Id: I0317175e5c25616addd0b651d48ce47d61503f00