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:49:28 +0000 (00:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 00:49:28 +0000 (00:49 +0000)
commit394357761ec1d1733cd7a43e7b5fa1cc0be5e189
tree368af5b5909ce75a6b2ad43cfbe1b5a2cc2bdaa8
parent56131cf7c063de3046e4575f2b93c2531b1ea7cb
parent4b3c59005b9eb08e418ff9301ed2600a8417e08a
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5  -s ours am: f82c373074 am: 8c9ff68173
am: 4b3c59005b

Change-Id: Ibc4221c090b1dab98c085486733c987d96c99210