tree eb14b4cd842000b0d4d101cbe4d15df79a8fda8b
parent 99755cb45841e6c2354a091ffef9400ad2594e84
parent b30169299b8841ae2754b0d180cf92a13cc33a89
author Jeff Sharkey <jsharkey@android.com> 1486669291 +0000
committer android-build-merger <android-build-merger@google.com> 1486669291 +0000

DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 78f2e38a12  -s ours
am: b30169299b  -s ours

Change-Id: Iac47439b256367683e44d09042996ad060c3c43d