| commit | 988e1712a340cdbfcdd1e84564b70ac8b529a851 | [log] [tgz] |
|---|---|---|
| author | Kevin Liu <congxiliu@google.com> | Wed Jan 11 15:14:54 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 11 15:14:54 2023 +0000 |
| tree | 7b0489f0c755ca3d284d1cf666c9777b4fdd6b97 | |
| parent | 61f81ffb07944efd90ab581eadc56889151a261b [diff] | |
| parent | 15ef36bc54b71060458c26ad8013192fbf657af1 [diff] |
[automerger skipped] resolve merge conflicts of 521278a00d23fc0932b103dedac4b9e4200d43b2 to tm-d1-dev am: 15ef36bc54 -s ours am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 93c143ed0a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20918022 Change-Id: I341ba1b28ad4b7b14da45f2e8c62c20d19d6fe91 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>