tree b33924f7dab0b23ad5c7fbd54f8c5925402c8b99
parent 6ff3e53faaab66975674e16a1822d926c529bc5d
parent 17b069107654c04f0ec2cc44d54da3a44006c710
author Mike Dodd <mdodd@google.com> 1439479809 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439479809 +0000

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

* commit '17b069107654c04f0ec2cc44d54da3a44006c710':
  Include new AOSP messaging app in base AOSP telephony builds.