OSDN Git Service

Merge "Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev am: 0354b...
authorJeff Sharkey <jsharkey@google.com>
Fri, 3 Feb 2017 01:59:51 +0000 (01:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 01:59:51 +0000 (01:59 +0000)
am: 651c9cd390  -s ours

Change-Id: Ica80e2af4f50e9e629654723021741bea53be930


Trivial merge