[automerger skipped] Merge "[Mainline] Use isActiveSubscriptionId instead of isActiveSubId for mainline" am: 75b3666b02 am: 0a1d15530b -s ours am: f9803fc6c2 -s ours

Browse Source

am skip reason: Change-Id If740c2d7ea2c1392d5fe538091ea6e5c4575ad26 with SHA-1 f4d2771526 is in history

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

Change-Id: I5fd41f91894c3596eb24935b9ddc17dac3d4ddf5

...

This commit is contained in:

Bonian Chen

2020-08-06 16:35:39 +00:00

committed by Automerger Merge Worker

parent 339c352ac3 f9803fc6c2

commit 4486da9ea9

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