tree 01cc412c9f35cbb90603373c084fa52bfe146aac
parent 9354dbac7e06c9e2da288d8f7173e13a7b5c21e8
parent 689c097eb3ad838f18fd13493cc0d73260f1137e
author Mike Dodd <mdodd@google.com> 1439480619 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439480619 +0000

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

* commit '689c097eb3ad838f18fd13493cc0d73260f1137e':
  Include new AOSP messaging app in base AOSP telephony builds.