am 818b239d: am f984eb42: Merge "Addressing API review issues for SmsManager (2/3)" into lmp-mr1-dev
am 818b239d: am f984eb42: Merge "Addressing API review issues for SmsManager (2/3)" into lmp-mr1-dev

* commit '818b239d0025a28dfdedca40ac60ebc85f1fc8ff':
  Addressing API review issues for SmsManager (2/3)

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base