[automerger skipped] Merge "[KDDI] Define carrier config for call forwarding items" am: f7c1dc5a3a am: 63c1d4e812 -s ours

am skip reason: Change-Id Ie49ca51497e8f0d9f16d14cc183311dcd02d8bbb with SHA-1 6206afc8c1 is in history

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

Change-Id: I8ff539e29e31cbaf7fab064df8cedd6bfb5f4e62
This commit is contained in:
Allen Su
2020-06-04 03:29:08 +00:00
committed by Automerger Merge Worker

Diff Content Not Available