[automerger skipped] Merge "Added cross sim calling settings support" am: 7f6a8a9648 am: aa7996126a am: a82cdddff4 -s ours

Browse Source

am skip reason: Change-Id I081c7e5fcc98f51a97c41a0a9a2b9b628c8d0415 with SHA-1 ea9050793c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I842d8636b3bc951efca7b0ce61a03936a53a523f

...

This commit is contained in:

Hui Wang

2020-12-17 17:31:55 +00:00

committed by Automerger Merge Worker

parent 096eeb8983 a82cdddff4

commit a4cc40ffde

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