| commit | 7860541df4ee7e095c4642d05d9537be2d91704f | [log] [tgz] |
|---|---|---|
| author | Brad Ebinger <breadley@google.com> | Fri Nov 13 00:22:57 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Nov 13 00:22:57 2020 +0000 |
| tree | 8d84b667ab81b9c80572ab09cb52bd47e3cac7d3 | |
| parent | 38dca4dea653dbecea4b2540f30f42690eaef447 [diff] | |
| parent | 8ffeb462fba0cb73af31c62eee1471ccd07b306e [diff] |
Merge changes from topics "sip_transport_api_conn", "sip_transport_api_def" am: c87a43111a am: ccc2835223 am: 8ffeb462fb Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1477122 Change-Id: Ica97dffaac838bf5dc2071aedbe64eb2bdcb25b2