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