commit | 7ae1c25074177c2bf323379214f376b4a9333e02 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri May 21 17:28:14 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 21 17:28:14 2021 +0000 |
tree | f7a839f41ee2222822b8518f3fd79a62423846c5 | |
parent | bcfe90a6b1f1e1cb56bfbee5d8d77513232e5483 [diff] | |
parent | c7e24440fc0e5b5ae5d8b2e2991493f2927c7298 [diff] |
Merge "Use S api in SettingsShim api 31" into sc-dev am: c7e24440fc Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/14493541 Change-Id: I0a838bef0317feb543dce454ccfb135fce6e2f6c