[automerger skipped] Merge "Make sure on non-dds phone, try MMS data connection when PS is not attached." am: e7418497c4 am: bcf39bac19 -s ours
am:37661a2ead-s ours am skip reason: change_id I43e150c1d0cc4065da07f4a5ec738b967e7a9a6d with SHA16499e6d95bis in history Change-Id: I7b1dcc3d383a9de361da01fdf46f7bda2d2703d8
This commit is contained in: