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 01:30:04 +0000 (01:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 01:30:04 +0000 (01:30 +0000)
am: 1e9b978dc7

Change-Id: I23fe0c7c446c3c2ed0570606a4ac9860df866295


Trivial merge