OSDN Git Service

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

Change-Id: Ib9e5a56a4bac34dbf9ef3fc4122d4a2ac1e0bb7e


Trivial merge