OSDN Git Service

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am: e6be8d765f
authorJeff Sharkey <jsharkey@google.com>
Fri, 3 Feb 2017 00:21:58 +0000 (00:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 00:21:58 +0000 (00:21 +0000)
am: 8f4f4daf2c

Change-Id: I049f66856f9354432f722fd29248720d76e6c5e1


Trivial merge