OSDN Git Service

DO NOT MERGE. No direct Uri grants from system. am: 021747a076 -s ours am: 4d9098284...
authorJeff Sharkey <jsharkey@android.com>
Fri, 3 Feb 2017 00:40:05 +0000 (00:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 00:40:05 +0000 (00:40 +0000)
am: 1007b773b9

Change-Id: I654882046c5024d2cbe939bd2727f15550ba4cef


Trivial merge