OSDN Git Service

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

Change-Id: Ifb220fbac07f4dcbb455080107ebc765611cf022


Trivial merge