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:33:40 +0000 (00:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 00:33:40 +0000 (00:33 +0000)
commit8c9ff68173cecda5f0b68a2bde475202c005ecca
treec415213d66999f55080104facd973beeb8dde6ac
parentbd2bec9164b98a98cf16674f60d1ee7ad01fac1b
parentf82c3730748893ac1e9ff5fe7353fa110e8d7ef4
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5  -s ours
am: f82c373074

Change-Id: I603a9a75c3874f1b7cf099aa26b865fdbe7b0e99