am 4cd9612c: am b776122a: Merge "Factor out read/write SMS settings seperate...
am 4cd9612c: am b776122a: Merge "Factor out read/write SMS settings seperate from send/receive." into klp-dev
* commit '4cd9612c':
Factor out read/write SMS settings seperate from send/receive.