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 00:22:15 +0000 (00:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 00:22:15 +0000 (00:22 +0000)
commitd20b04a41db9a514b3eab8f3654f95707645ffc5
tree4e8ec4ba6e1fbd6afaf4c23511a0046d7020ddc3
parent61e917964665cf111a7495142b746a689b71de62
parentb058dc139dcea65def3d8c842aa37ea5dc2695a8
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f  -s ours
am: b058dc139d

Change-Id: Idd1aeb4749741aa8bae76cf43ce3f2bdceff077d