| commit | 666fbf6275de81fca3ac7b1846419d70db18a371 | [log] [tgz] |
|---|---|---|
| author | Brad Ebinger <breadley@google.com> | Thu Oct 22 00:30:33 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 22 00:30:33 2020 +0000 |
| tree | 8d6497f38e070f637d8fd63b8129c3075bc1b845 | |
| parent | 28652b0739949dc3ed5468c85df427f8d745e876 [diff] | |
| parent | 371361d9955798ebef8473287c21caf8052741ba [diff] |
Merge changes from topics "cp_sip_transport_supported_api", "cp_sip_transport_supported_pipe" am: 9caec78557 am: 371361d995 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1453715 Change-Id: I7ab937749fe61a92a73d28d2b4e53b98db704683