commit | 0f324fc00571e2a421cd38ab1caeedb6e20c2732 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Mar 22 12:33:19 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 22 12:33:19 2021 +0000 |
tree | 4631f35cdb975b116dec47d73a4a4fb7f172595f | |
parent | 8908af0828d8ec2f1ed3a9d8ea0f38ccdae3f0da [diff] | |
parent | d914ad7ad95a98e056551c974e87d89c42bddebd [diff] |
[automerger skipped] Merge "Correct the logic in NetworkCapabilitiesTest" am: 58f4cdf3b3 -s ours am: 8297bc95a0 am: d914ad7ad9 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640144 Change-Id: I52d135904ffc8cb4aae0166deb7bfaedc969a583