| commit | 1112a774e000fe2223d58b3ec134b644e97cf215 | [log] [tgz] |
|---|---|---|
| author | Weng Su <wengsu@google.com> | Fri Apr 05 16:53:53 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 05 16:53:53 2024 +0000 |
| tree | 6ebc7d7b4868b1145d7cc54195778c091c98689b | |
| parent | 70d03ec35be5be6dda75a4fbd09b1f9f94111b10 [diff] | |
| parent | 981673f940bdf35395a1434c272cd87eeb68b557 [diff] |
[automerger skipped] [conflict] [RESTRICT AUTOMERGE] Restrict WifiDppConfiguratorActivity am: 254ba087c2 am: 3d6b2b688e am: 981673f940 -s ours am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26838814 Change-Id: I074db2071f87741f334c35459655b1946d92339a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>