tree d81bc7c3ffe2ee9f4e14ecc79b34ffa0d9d27d1a
parent 824c8284ce3734ae7b37bcad5b4251861d94f27b
parent deea6773590261006fe2f00e88e83adcaf27a382
author Jeff Sharkey <jsharkey@android.com> 1486893850 +0000
committer android-build-merger <android-build-merger@google.com> 1486893850 +0000

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

Change-Id: I579175736bf9c3839492e67d08b8ce765c85c121