commit | ba3fe432019e9c0b8a2ddb2257bb04bb9b246ecc | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 08 01:20:30 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 01:20:30 2021 +0000 |
tree | c9a45b33b3c2d00e39bc4be8877abfcd86fa1e41 | |
parent | a1de4c6517ec3d392a545590f4b18a090fe236c6 [diff] | |
parent | a4437a549e23a039cbc9d7ecc5887d724a6f279b [diff] |
[automerger skipped] Merge "Merge Android 12" am: a4437a549e -s ours am skip reason: Merged-In I2ae85401e7ede34a6b4f04d82ee597ae6fd4575e with SHA-1 a1de4c6517 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/1847378 Change-Id: I42ee571e8120ae258630b8b09f372f155e1cb79e