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

Change-Id: Idd62b3a72d5f8daf403100c6a6150b5792c00de7


Trivial merge