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