OSDN Git Service

DO NOT MERGE. No direct Uri grants from system. am: b61338ecb3 am: 30a4388481
authorJeff Sharkey <jsharkey@android.com>
Fri, 3 Feb 2017 01:33:41 +0000 (01:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 01:33:41 +0000 (01:33 +0000)
am: 825a242ea9

Change-Id: If76c1073c80718296c814b43971b89f642ada7c9


Trivial merge