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

Change-Id: I4c4b40569545c26adc8f3f4b8c82ac6525f89b22


Trivial merge