tree 44b85a7c9ab7911531115d2087219f04e923378e
parent 502ee22a9d842513d83ab8edb3da22ab89a594b9
parent 9335807fc4665aa171e2cb06b3c08eb37601eef0
author Jeff Sharkey <jsharkey@android.com> 1486893994 +0000
committer android-build-merger <android-build-merger@google.com> 1486893994 +0000

DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 6f754e48e9 am: a0b1198e70  -s ours am: 48f1ddc94a am: 00f5232dd0
am: 9335807fc4

Change-Id: I66766f7b8feccdf1855b3819ca30cec5b480ef07