[automerger skipped] Merge "multiSimAllowed should be consistent with max active modem property." am: 2641543774 am: f4804c9e92 -s ours am: 94664fd08f -s ours
am skip reason: Change-Id I2d38dd9a0a860ee451fe51372a62c2910b88c88f with SHA-1 ba874c6827 is in history
Change-Id: I7254d58089f98091ccd08be306ef3d61ee0a63a9
This commit is contained in:
committed by
Automerger Merge Worker
commit
8dbfbf7400