OSDN Git Service

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am: e6be8d765f...
authorJeff Sharkey <jsharkey@google.com>
Fri, 3 Feb 2017 00:34:57 +0000 (00:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 00:34:57 +0000 (00:34 +0000)
commitf19cea14cf3e42374e96896b1cc4ba1564a5dd69
tree3d82a5c37f20684a796e0128e6dab1093f7089ef
parent1a9c03f320b6b8ec4fd06738686f2e7f094bef29
parent2848738526e0ba2de039a467bcd51dd417583fef
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am: e6be8d765f am: 8f4f4daf2c am: 7c0ea478a8
am: 2848738526  -s ours

Change-Id: I7c56e83a5de15ec7d3432e3ca4ec385499069f40