commit | dcd4caead2a25e8ef5d1385ff6891604c16c1f33 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 06 09:05:00 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 06 09:05:00 2023 +0000 |
tree | ce0eb4adbd3409ce14884317293b64aceedb3ed4 | |
parent | 453a7cada6f7b50e986489bf206418d9f26f7813 [diff] | |
parent | 1773ab5b6f5c35b27dfa997b9438cbacef5ba9f2 [diff] |
[automerger skipped] Merge "Merge Android 14" into main am: dc85f402d5 -s ours am: 1773ab5b6f -s ours am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 5d8fea06b1 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2777108 Change-Id: Iec9ab42a8a7b6f0d4c98332b87dd9aa982f762c0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>