OSDN Git Service

Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530
authorJeff Sharkey <jsharkey@google.com>
Fri, 3 Feb 2017 00:23:24 +0000 (00:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 00:23:24 +0000 (00:23 +0000)
commitf82c3730748893ac1e9ff5fe7353fa110e8d7ef4
tree240c97834972776aa566aaf720abf598a8500492
parent05749525a522fb7f153ac7cada375736c988fbc3
parent5d65931af5c19c6aa582343eedc821712b0559f4
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530
am: 5d65931af5  -s ours

Change-Id: I14933edb3f93eea4156698bb2669938849c30697