commit | ccc283522311b69b2758fbc73205aec0ad0f6a06 | [log] [tgz] |
---|---|---|
author | Brad Ebinger <breadley@google.com> | Thu Nov 12 23:39:04 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 12 23:39:04 2020 +0000 |
tree | 8861eaf35c990813c1b82dfbd6ebe23d11164d35 | |
parent | 20734105de9b050d8037e62be3f1bf66cedbaeda [diff] | |
parent | c87a43111a1eeb094f90153a7bc9bf654f3cd676 [diff] |
Merge changes from topics "sip_transport_api_conn", "sip_transport_api_def" am: c87a43111a Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1477122 Change-Id: Ib5c191e9e17ff8b82e266b9d3907bc96e0fde685