| commit | 3b63cdc8c64fdc7a2a77d5d05751f7f59ec6915e | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Jun 08 16:42:08 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 08 16:42:08 2020 +0000 |
| tree | 0b0da8be4248bd04ec2fe56615164978ec9596ef | |
| parent | 443f502221af444a57f73587cf208fb94a472e7d [diff] | |
| parent | 052f99f8280ce5c9a45b5edd9d0377fe89d1779b [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 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: Ic1816515375a363d25bf7cb545413cd778ec835b