OSDN Git Service

Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-mr1-dev am: 6b8ae05e...
authorJeff Sharkey <jsharkey@google.com>
Fri, 3 Feb 2017 01:53:43 +0000 (01:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 01:53:43 +0000 (01:53 +0000)
am: 579dd3b014  -s ours

Change-Id: I521a26e52905983a855217aa8e3d0f9b68fe2d44


Trivial merge