| commit | 9f6dbb714b06aba312ee6579b98aedfe406048a6 | [log] [tgz] |
|---|---|---|
| author | Brad Ebinger <breadley@google.com> | Thu Oct 22 06:08:07 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 22 06:08:07 2020 +0000 |
| tree | 2d71b565b15d025784af6dc9f28e20cedb6ab83c | |
| parent | 226fac9bb759cfa45b8f644e6ec916b70fd279fd [diff] | |
| parent | b676909254001b049e568c8fd6bd1be654ef8ef9 [diff] |
[automerger skipped] Merge changes from topics "cp_sip_transport_supported_api", "cp_sip_transport_supported_pipe" am: f832729d49 am: 9989567174 am: 0e2db46212 am: b676909254 -s ours am skip reason: Change-Id I01677351c53b8c8480736f1a6539ece0bedf685f with SHA-1 9c5578ae63 is in history Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1453676 Change-Id: I4925708915d8539be34d1391e6fb8ce9c2a10091