OSDN Git Service

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am: 7115ad711...
authorJeff Sharkey <jsharkey@google.com>
Fri, 3 Feb 2017 00:51:19 +0000 (00:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 00:51:19 +0000 (00:51 +0000)
am: 7a6bd686a3

Change-Id: I30d3bad3c7c6e6779d5c2b964ae4aa5b68b82bbd


Trivial merge