| commit | 9d33a7160dbac964c6f9c56ca6d2e0baccb5d7ca | [log] [tgz] |
|---|---|---|
| author | Mark Chien <markchien@google.com> | Fri Oct 01 02:36:19 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 01 02:36:19 2021 +0000 |
| tree | 4ea5dda953cc10bcba472b59e698a20d21700ec5 | |
| parent | 3ef27abf83c776ecbe9093ad53a120db1c0a8d4d [diff] | |
| parent | 55af8a15e7628049cf91181007b0496100502e27 [diff] |
[automerger skipped] Merge "Use SettingsShim to hide different implementation in shim" am: 05fd386de8 -s ours am: 77c2e2ecb5 -s ours am: 6bff95320d -s ours am: 55af8a15e7 -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: I909714668f6c1092e7ab69a188f9ff297d6148cd