commit | b3aa668458c80aa36c1ba759192d7ad2b874beaf | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 08 01:39:56 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 01:39:56 2021 +0000 |
tree | c9a45b33b3c2d00e39bc4be8877abfcd86fa1e41 | |
parent | 883e10b6eb4fbb1bbce51fda70d053ebf11a78d1 [diff] | |
parent | ba3fe432019e9c0b8a2ddb2257bb04bb9b246ecc [diff] |
[automerger skipped] Merge "Merge Android 12" am: a4437a549e -s ours am: ba3fe43201 -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: I6d9b2458619b757c3b3f2768d686b83192663fa6