tree 42c57141925a8d7877fe886adf231f369b2e9563
parent 71fde725b61abc637aab6be41a50353702775431
parent 00e15cd5554c25ba006b355945db1cc1f00fc3c7
author Mike Dodd <mdodd@google.com> 1439406857 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439406857 +0000

am 00e15cd5: am 09baf014: am 745d11cc: Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev

* commit '00e15cd5554c25ba006b355945db1cc1f00fc3c7':
  Revert "Include new AOSP messaging app in base builds."