| commit | b200f2b9b01363a717234fa97c3d2929df5fce46 | [log] [tgz] |
|---|---|---|
| author | Brad Ebinger <breadley@google.com> | Thu Oct 22 06:08:10 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 22 06:08:10 2020 +0000 |
| tree | 3773feff51d9fb735a94bec2ac0386bc88795514 | |
| parent | 3ee7efe05687d736f5bba155e60fa954e4446a68 [diff] | |
| parent | 0bd605173dccec0743174b99c7bc83614992a0a4 [diff] |
[automerger skipped] Merge changes from topics "cp_sip_transport_supported_api", "cp_sip_transport_supported_pipe" am: 9caec78557 am: 371361d995 am: 666fbf6275 am: 0bd605173d -s ours am skip reason: Change-Id I7fbd39a8ff17c4e947fdbcca148857684faa3252 with SHA-1 119076ae6e is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1453715 Change-Id: I29234ad9190b8be4457c258b2120cea5a8c6a4eb