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:39:31 +0000 (00:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 00:39:31 +0000 (00:39 +0000)
am: 609145c315

Change-Id: I212139b16c6b00a3a1b61a851bb7f7099ecf2120


Trivial merge