[automerger skipped] Merge "Mainline remove hide api SubscriptionInfo.getCardString" am: d3c8a4c3ee am: d03c8bfb1c -s ours am: 4cd2283768 -s ours am: 5c1fbcc7d1 -s ours am: 9283706109 -s ours am: f2929f3dab -s ours

am skip reason: Change-Id Idb44af6a01626013339f5ca05486dd11112a5867 with SHA-1 5189dc3860 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387128

Change-Id: Ic9f96bef9ab32f7a98b98c665a2b10f52a4ae107
This commit is contained in:
Bonian Chen
2020-08-05 10:39:42 +00:00
committed by Automerger Merge Worker

Diff Content Not Available