| commit | 8ffeb462fba0cb73af31c62eee1471ccd07b306e | [log] [tgz] |
|---|---|---|
| author | Brad Ebinger <breadley@google.com> | Thu Nov 12 23:58:29 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 12 23:58:29 2020 +0000 |
| tree | adf815c0114c34c829249c4f1e9e742c15050147 | |
| parent | 449e45b1168c533dbe3ed74670ed390494efd21c [diff] | |
| parent | ccc283522311b69b2758fbc73205aec0ad0f6a06 [diff] |
Merge changes from topics "sip_transport_api_conn", "sip_transport_api_def" am: c87a43111a am: ccc2835223 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1477122 Change-Id: I6e98f08baf6f8a847e37f0f6d88ce0179d8b972f