OSDN Git Service

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev
authorJeff Sharkey <jsharkey@google.com>
Fri, 3 Feb 2017 00:12:31 +0000 (00:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 00:12:31 +0000 (00:12 +0000)
commit0e09e8c201324506f65c185340cf278e4492e19b
tree3d82a5c37f20684a796e0128e6dab1093f7089ef
parent4d90982846a842131e3fcef29e69228c3fe86642
parent1f007d14712a8f3c876adf7b75d09afa3538221c
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev
am: 1f007d1471  -s ours

Change-Id: I5fb0f4d1ebf169c8e1309c1d7549d34b362c8328