OSDN Git Service

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

Change-Id: Ia5544d9edc2a5e2eb9582423afc164d56049d754


Trivial merge