OSDN Git Service

Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e5...
authorJeff Sharkey <jsharkey@google.com>
Fri, 3 Feb 2017 01:05:28 +0000 (01:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 01:05:28 +0000 (01:05 +0000)
am: bafa3c1d3b

Change-Id: Ifacdf34a063571d521dc635003ddabb3228460d4


Trivial merge