| commit | 988956248ad7518702a45d54a11bb10fa0e1ae43 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 06 11:00:24 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 06 11:00:24 2023 +0000 |
| tree | 33eacce66a0418a79240cb84db166146b4d0b486 | |
| parent | c649d7815460189b20056cf8a6c6ba1b3563b645 [diff] | |
| parent | 12ce5ee127042a18be7dd0fb9fa1d1e581384f92 [diff] |
[automerger skipped] Merge Android 14 am: b502ecb835 -s ours am: a180a0f964 -s ours am: 6472beda1b -s ours am: 12ce5ee127 -s ours am skip reason: Merged-In I885e1dfab6bbe15ec70347ccfc8c3ffe2349f16f with SHA-1 02b6851b7f is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2777032 Change-Id: I7a54c99ab76de6a311d381e64f0147b7bf6b0983 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>