OSDN Git Service

Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f...
authorJeff Sharkey <jsharkey@google.com>
Fri, 3 Feb 2017 01:24:20 +0000 (01:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 01:24:20 +0000 (01:24 +0000)
am: 5a50d2b12c

Change-Id: I32bf2850fe25f5e0ec9df96042da467a21d90990


Trivial merge