tree 190876cce7001c3e770bddecc1d0b72d61652f8e
parent a533e9c77aab1837a2dd713385fc857005741173
parent 813fb93261f78aef6ba4ffe82d3fae9277dcfe7a
author Betty Zhou <bettyzhou@google.com> 1486590478 +0000
committer android-build-merger <android-build-merger@google.com> 1486590478 +0000

Fix MMS send and receive failures. am: 05e6c67f0e
am: 813fb93261

Change-Id: Id9f388dd0153350bf4779e8fe54c55240ec23c1d