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:46:45 +0000 (00:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 00:46:45 +0000 (00:46 +0000)
am: a7388f1ed4

Change-Id: I92e758c2f2a5d978b9fcd4779e486711f7b1ebe3


Trivial merge