OSDN Git Service

Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-mr1-dev
authorJeff Sharkey <jsharkey@google.com>
Fri, 3 Feb 2017 00:10:09 +0000 (00:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 00:10:09 +0000 (00:10 +0000)
am: 6b8ae05e36

Change-Id: I3390fac08bf7047fce526b2553c1fb2908c4167c


Trivial merge