commit | f431b6cfff990a9a2ee04a41cef43e52438e9da2 | [log] [tgz] |
---|---|---|
author | t <locc@google.com> | Thu Oct 31 18:15:08 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 31 18:15:08 2024 +0000 |
tree | fcd6996db8f2e7b16dd497dbddd3a2435f11dd14 | |
parent | 27a3d7bcd0ee999691015e184678acba4a5fb772 [diff] | |
parent | 872ffc61f6c694b4203525dd5e5591e2bfe2f4e3 [diff] |
[automerger skipped] Disable factory reset in DSU mode am: a2741a76cb -s ours am: d8cb5e9765 -s ours am: 13412879cc -s ours am: 8f55d65e04 -s ours am: d9c410ea15 -s ours am: 872ffc61f6 -s ours am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 27619dd45c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30066436 Change-Id: I7371ee2ab46a1b5dda8cd183fcfb85ed05816fcf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>