| commit | ec39446b7690971e953f298bfb4715b3e9688dc6 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sat Oct 07 00:25:49 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Oct 07 00:25:49 2023 +0000 |
| tree | 94a806db4494f1955181ebab697b8f19960ea7cc | |
| parent | a79e1d31ebc3ba4e7da741a23671ad01c77ab222 [diff] | |
| parent | 6dd6ff5b88890b0d00560e27ee0b9ab990e9ccaf [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: 6dd6ff5b88 -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: I297094f91a5dd73653f120b373c6095e61437345 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>