OSDN Git Service

DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0 -s ours am: 4a4b6bfaf...
authorJeff Sharkey <jsharkey@android.com>
Fri, 3 Feb 2017 00:50:28 +0000 (00:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 00:50:28 +0000 (00:50 +0000)
am: f51e8e8642

Change-Id: I94a2e244e7ab2d9571632f2d79fcce0ed38e3320


Trivial merge