| commit | 18b730cbbbb559218e66b7a43611f3c330cfc3a1 | [log] [tgz] |
|---|---|---|
| author | Caitlin Shkuratov <caitlinshk@google.com> | Thu Feb 09 16:18:20 2023 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Feb 09 16:18:20 2023 +0000 |
| tree | e064f78e02ff9e2658cd37528c80042c2cef27d2 | |
| parent | cf12ebac3ab08d49d392b1c0282892c4000b0982 [diff] | |
| parent | 698a80bfdf6f104d18496b70a2642dcd35397793 [diff] |
Merge changes I6a6916fd,Ia7fdd0c8,Id2e73b83,If3e00d82,Ia7eb62d6 into tm-qpr-dev * changes: [SB Refactor] Support network names for carrier merged. [SB Refactor] Cleanups in the carrier merged connection repo. [SB Refactor] Don't update the network name if the subId doesn't match. [SB Refactor] Supprt activity in/out for carrier merged connections. [SB Refactor] Make demo wifi's activity always non-null.