commit | 6dd6ff5b88890b0d00560e27ee0b9ab990e9ccaf | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 06 11:06:20 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 06 11:06:20 2023 +0000 |
tree | 953df69dddcf6d8e372ef87aec49944d08677937 | |
parent | be4f23f242c600d7f8e174883000cc0805837ebe [diff] | |
parent | fdc85fa1cf2a80eec05ac309a59ac98811e246b1 [diff] |
[automerger skipped] Merge "Merge Android 14" into main am: dc85f402d5 -s ours am: 1773ab5b6f -s ours am: dcd4caead2 -s ours am: fdc85fa1cf -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: Ief7a0ae2988258d584c86d0af467e54c487bfcaf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>