OSDN Git Service

DO NOT MERGE. No direct Uri grants from system. am: 021747a076 -s ours am: 4d9098284...
authorJeff Sharkey <jsharkey@android.com>
Fri, 3 Feb 2017 01:37:59 +0000 (01:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 01:37:59 +0000 (01:37 +0000)
am: 030e74a380

Change-Id: I50b94061271fc8ea4ea87182a2c2628c8b5e82be


Trivial merge