OSDN Git Service

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

Change-Id: I4d1e712d09daae9621c5acf336b9ead190920e98


Trivial merge