commit | 8a9c9a963deabc3c831b0388734273ebf35b72d8 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Mon Jun 08 17:25:11 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 08 17:25:11 2020 +0000 |
tree | 0b0da8be4248bd04ec2fe56615164978ec9596ef | |
parent | ac122e5855d452026bcee681738d2d809474b0cc [diff] | |
parent | 3b63cdc8c64fdc7a2a77d5d05751f7f59ec6915e [diff] |
[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 9d0f1c35df -s ours am: c56d0141a8 -s ours am: dc9ce0f7b7 -s ours am: 052f99f828 -s ours am: 3b63cdc8c6 -s ours am skip reason: Change-Id I69b76603053fa88c407d2401a9738cac216432e4 with SHA-1 8c4f391b0b is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/1323222 Change-Id: I3c9cdb609157537bc49b7b520eb24719f33497e4