tree ea87226f149270f9c8cdc6e266532b671e773a20
parent 870a6a5427f4a23d6fe5bd3ac9bb49d82c86e9c7
parent 2d4b7b7362036e7f864b1d9eeb39d671359e9f7b
author Zhihai Xu <zhihaixu@google.com> 1381366179 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381366179 -0700

am 2d4b7b73: am c14e9468: Merge "Remove MMS support from MAP profile" into klp-dev

* commit '2d4b7b7362036e7f864b1d9eeb39d671359e9f7b':
  Remove MMS support from MAP profile