OSDN Git Service

DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8 -s...
authorJeff Sharkey <jsharkey@android.com>
Fri, 3 Feb 2017 00:48:41 +0000 (00:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 00:48:41 +0000 (00:48 +0000)
am: 1ddaf2f96b

Change-Id: I06a6d16b17cd5611247a442c2e7fa7b7b21134cf


Trivial merge