tree 00f81f074c4fc57d6dfde54ebc18a3dc27b5e140
parent d4adaada5578eabe8c9b18d520c39f0398e35008
parent 8c23d1aadbdc7ac52e74c9c6cb1a92ed36aab920
author Jeff Sharkey <jsharkey@android.com> 1486085686 +0000
committer android-build-merger <android-build-merger@google.com> 1486085686 +0000

DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8  -s ours am: 05749525a5 am: bd2bec9164 am: 1ddaf2f96b am: 56131cf7c0  -s ours am: cdb996355e am: d2a9d6fa27 am: 8d9953964a
am: 8c23d1aadb

Change-Id: I92db1043b77799dd3c7a9c6852c258bc0d5aa8ed