am 36b35916: am 4dba40c6: Merge "Fix reboot lost setting issue, retry sms when signal comes back." into mnc-dev

* commit '36b359160c160e3d0b4f9e2f72e189921ccc54bd':
  Fix reboot lost setting issue, retry sms when signal comes back.