tree 7cb0724469e610c984d9f7e3a2a49c70e68edcac
parent 4569ba89bb6159fc20edba350f66dae874c9a8e3
parent dae5afbec5a0c579c189bf4c0952341fe726e924
author Tom Taylor <tomtaylor@google.com> 1366051476 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366051476 -0700

am dae5afbe: Merge "[Canada] max MMS size needs to be changed for some Carriers" into jb-mr2-dev

* commit 'dae5afbec5a0c579c189bf4c0952341fe726e924':
  [Canada] max MMS size needs to be changed for some Carriers