OSDN Git Service

Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e5...
authorJeff Sharkey <jsharkey@google.com>
Fri, 3 Feb 2017 00:40:52 +0000 (00:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 00:40:52 +0000 (00:40 +0000)
commit4b3c59005b9eb08e418ff9301ed2600a8417e08a
treef11e52af9e99a105f7cbc99d8b605dce13638578
parent1ddaf2f96bb527c2a48cbc88ae0a42ac75e85cb4
parent8c9ff68173cecda5f0b68a2bde475202c005ecca
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5  -s ours am: f82c373074
am: 8c9ff68173

Change-Id: Iaa739f638e66376a2aa145a465255f738f9b3f1b