commit | 77c2e2ecb512c4432e2e29963c2af511c7ce492a | [log] [tgz] |
---|---|---|
author | Mark Chien <markchien@google.com> | Fri Oct 01 01:48:40 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 01 01:48:40 2021 +0000 |
tree | cddd6f18d1a1f793ff2d848d7d85d31fe3c5438f | |
parent | 3c811e1e55e8cdaa9c16129bf28374f25dd2e1fd [diff] | |
parent | 05fd386de82cf032b4f238368e020d33b0167ad5 [diff] |
[automerger skipped] Merge "Use SettingsShim to hide different implementation in shim" am: 05fd386de8 -s ours am skip reason: Merged-In I3e7f6525e9776992bd96b17c132b749b12285bbd with SHA-1 dfa5697a70 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1700809 Change-Id: Iee833c651c7c8e77d9b828eb8d0ead9a57ce513d