OSDN Git Service

DO NOT MERGE. No direct Uri grants from system. am: bac46f5b65 am: 3da69c1115 am...
authorJeff Sharkey <jsharkey@android.com>
Fri, 3 Feb 2017 00:52:36 +0000 (00:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 00:52:36 +0000 (00:52 +0000)
am: fd855eeb29

Change-Id: I7c7a9ef89e04e5420655d4ecba55c37cfacaf84b


Trivial merge