| commit | 156454b446859a22232bae93a6c7b5188bdf830d | [log] [tgz] |
|---|---|---|
| author | t <locc@google.com> | Thu Oct 31 17:57:35 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 31 17:57:35 2024 +0000 |
| tree | 8b06ada2781d1919e357b3b5b43d95b3b642c3c4 | |
| parent | c6a9dcc88e6be43c887730b584095a507eb97824 [diff] | |
| parent | 374da97b521cd69b1a9ac3c05a3568d024bea365 [diff] |
[automerger skipped] Disable factory reset in DSU mode am: 4296cc1977 am: d1f90f717a am: fc128d434f -s ours am: 7d3a9a197f -s ours am: fbebc1cd0e -s ours am: 9c42b1876f -s ours am: 374da97b52 -s ours am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30066430 Change-Id: I06a96a876b34113da3b0929063a4426fdafcbc22 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>