commit | b7a00f3f12d08b53db41ae503be134b9445f7314 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Mon Dec 11 23:00:36 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 11 23:00:36 2023 +0000 |
tree | 836054f277fbf4e3300bc992a080fd406b6cd2b3 | |
parent | 16492cd30bfb27f16b277966152bf7c10630b82e [diff] | |
parent | 8f840cc2845d9457cac20101538d1a3f250d3968 [diff] |
[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 7fdcb37d85 -s ours am: 2b16ae3a02 -s ours am: 8f840cc284 -s ours am skip reason: Merged-In I1fbd86e4d1ba15fffe7da32728b2b0ed489e20c1 with SHA-1 cb2e4328ea is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2865170 Change-Id: Icc2a8e6b0e617e5da594e0de7cb997c34621b0e9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>