tree d98dd051ba5f42eb36a731cb87bf40d278e037ec
parent c48fc566b5a405381b4fdc769365ef358a6dd0d5
parent 3b7ee3598f841a1c73a26b834a3ec9e2431924ae
author Jeff Sharkey <jsharkey@android.com> 1486670687 +0000
committer android-build-merger <android-build-merger@google.com> 1486670687 +0000

Merge "DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 78f2e38a12  -s ours am: b30169299b  -s ours am: 31c7fa003d  -s ours am: 966e600365  -s ours" into nyc-mr2-dev-plus-aosp
am: 3b7ee3598f  -s ours

Change-Id: Iab23629aac79aa226a1d21508b4db9648537954b