[automerger skipped] Merge "Patch to update QC CDMA MO SMS change" am:...
[automerger skipped] Merge "Patch to update QC CDMA MO SMS change" am: e9501ca4 am: 9cec2166 am: fea69633 -s ours
am skip reason: Change-Id I855ffe313ee67a65c6ce06faba10954a64e0703a with SHA-1 7e3fe33c is in history
Change-Id: I6243cdf44256013ebda17da58a44917bd06338bb