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

Change-Id: I658d46b2c675ecedb08c32275d0cfbb6b84c1f77


Trivial merge