| commit | 62fc5a1ec81ca04f071640dafe96d45bfc3f86f2 | [log] [tgz] |
|---|---|---|
| author | Mark Chien <markchien@google.com> | Fri Oct 01 02:03:33 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 01 02:03:33 2021 +0000 |
| tree | 65c38462441c536dd4359bf38559d3a350c7fc93 | |
| parent | cdc172d80ab892f15473235a97126b2ea6f94222 [diff] | |
| parent | 77c2e2ecb512c4432e2e29963c2af511c7ce492a [diff] |
[automerger skipped] Merge "Use SettingsShim to hide different implementation in shim" am: 05fd386de8 -s ours am: 77c2e2ecb5 -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: I194ab461af6983e721d29fab30f46762bf1b233f