| commit | 8f5103a7489dcab0b91d1e5877e9aedbe84d895d | [log] [tgz] |
|---|---|---|
| author | Kevin Liu <congxiliu@google.com> | Wed Jan 11 15:31:12 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 11 15:31:12 2023 +0000 |
| tree | 16976c3e4b15aff1d018a6528b14ed39d57fd7a8 | |
| parent | 02cace2f6737d7e2b45706446e74554482f6b1fd [diff] | |
| parent | 988e1712a340cdbfcdd1e84564b70ac8b529a851 [diff] |
[automerger skipped] resolve merge conflicts of 521278a00d23fc0932b103dedac4b9e4200d43b2 to tm-d1-dev am: 15ef36bc54 -s ours am: 988e1712a3 -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: Ib4d64f88405e9e6a7925787ba2d4bd3c28ac69ec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>