am 148839b2: am 17b06910: am 5bf35d06: Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev

* commit '148839b275619d89e3572668dbb54012117ef78b':
  Include new AOSP messaging app in base AOSP telephony builds.