tree 00f81f074c4fc57d6dfde54ebc18a3dc27b5e140
parent e12285ac47308f5e35421f5bb2d4c0f5ccc6d0b2
parent 30a4388481de8a180e2fc701501051da89f208d3
author Jeff Sharkey <jsharkey@android.com> 1486084973 +0000
committer android-build-merger <android-build-merger@google.com> 1486084973 +0000

DO NOT MERGE. No direct Uri grants from system. am: b61338ecb3
am: 30a4388481

Change-Id: I8b612304980150f522b0424e564f3bedf030c2b9