tree 7c04ea27fcc6f1dc54e09b94b5ea5d6576bee1eb
parent bdfb1b86d3e7a49840163560d4394a3e78e0ec8e
parent 86f242b07149cd25c4789c04d7da9a9206ecfe43
author Jeff Sharkey <jsharkey@android.com> 1486894572 +0000
committer android-build-merger <android-build-merger@google.com> 1486894572 +0000

DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9 am: 32c71b078c am: 75f767afa1 am: 502ee22a9d  -s ours am: deea677359 am: 853e178de4 am: c7b754f62b
am: 86f242b071

Change-Id: Iec17b7e2b1dcc972951e71d3c0d9e12d03440e88