[automerger skipped] Merge "Support getSlicingConfig() API for 5G Slicing Configuration" am: 2823967c2d -s ours am: cf13a4b17c -s ours

am skip reason: Merged-In I0addc2b22c11b13759e890d88f51490993fb72e1 with SHA-1 c638307194 is already in history

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

Change-Id: I40ed41ab3ef8353ed1f27d7d8c2fb801a9c0a6e2
This commit is contained in:
Sarah Chin
2021-09-09 02:29:01 +00:00
committed by Automerger Merge Worker

Diff Content Not Available