[automerger skipped] Merge "Add relative APIs for InCallService that can support self-managed connections that want to expose itself." am: 59c47d24fc am: f5468331b4 am: 3771f5e563 -s ours am: 6de81a4c5d -s ours

Browse Source

am skip reason: Change-Id I0a42ea79a1cd46aa9df3399c4fa2e9396321778a with SHA-1 e99fde9678 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1526998

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d71cf980d7a5899a72e03859369c256f47bee35

...

This commit is contained in:

Grace Jia

2021-02-01 19:53:22 +00:00

committed by Automerger Merge Worker

parent bed569a8a9 6de81a4c5d

commit ebc59702fc

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