OSDN Git Service

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

Change-Id: I502a04687a3a7840860e1a3af0a702f7162a8897


Trivial merge