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