tree 3d82a5c37f20684a796e0128e6dab1093f7089ef
parent f68199a4721e92a066fb2f671311731d0f65e35e
parent 4942836d3cdc33a17874b760a2e671a294f04d47
author Jeff Sharkey <jsharkey@android.com> 1486082044 +0000
committer android-build-merger <android-build-merger@google.com> 1486082044 +0000

DO NOT MERGE. No direct Uri grants from system. am: bac46f5b65 am: 3da69c1115 am: b5740f8c53
am: 4942836d3c  -s ours

Change-Id: I72d83bb758c1b70a46eb244d93b932ea2dcf1cb4