| commit | 981673f940bdf35395a1434c272cd87eeb68b557 | [log] [tgz] |
|---|---|---|
| author | Weng Su <wengsu@google.com> | Thu Apr 04 20:18:44 2024 +0000 |
| committer | Weng Su <wengsu@google.com> | Thu Apr 04 20:29:43 2024 +0000 |
| tree | c9185b40e8fe0eebcaad8fc142ec6def1000a448 | |
| parent | 2a9ea31fb5b119689a335e90f3cf4f0008ea681b [diff] | |
| parent | 3d6b2b688e18d569293d65928ec8132d2ab954e4 [diff] |
[conflict] [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2 am: 3d6b2b688e Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26808831 Change-Id: I7f37ea9867aff063d8a22580d84ab0007abad77c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>