[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

Browse Source

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

...

This commit is contained in:

Brad Ebinger

2020-10-22 06:08:10 +00:00

committed by Automerger Merge Worker

parent 3ee7efe056 0bd605173d

commit b200f2b9b0

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available