[automerger skipped] Merge "Merge "Fix issue that user can't edit WFC mode for SIM2" am: d2727d5d9f am: c91d33798b" into qt-dev

am: ba05893e37 -s ours
am skip reason: change_id Icb3bd924f9e8e3e2e82845ab85ef25c2e38e13dc with SHA1 ac4a495fc2 is in history

Change-Id: I6e9aabab4263185ec4e604a4b092e1298350b746
This commit is contained in:
Brad Ebinger
2019-04-11 16:42:25 -07:00
committed by android-build-merger

Diff Content Not Available