OSDN Git Service

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

Change-Id: Ieca522b743bf9d1840b657b19a5a4f4ffe80a8fd


Trivial merge