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 01:02:56 +0000 (01:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 01:02:56 +0000 (01:02 +0000)
am: c2a168d0ea

Change-Id: Ieb81e3872efd636a632ced390e41e2cd5156c81f


Trivial merge