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

Change-Id: I9d9889577061ada5de8c0213ec73d257469466e8


Trivial merge