tree 9771853fafcda0dd76a000c2a533e0c7affb1aa5
parent edb9b8df234f3559a8a8e518cdc0618d709c7155
parent 5b49be4488011879b7bb8390230607aef84dee0a
author Jeff Sharkey <jsharkey@android.com> 1486894841 +0000
committer android-build-merger <android-build-merger@google.com> 1486894841 +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
am: 5b49be4488

Change-Id: I576f71a635e1d1da44506b4e10ea7d915f5e7ba5