OSDN Git Service

Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev
authorJeff Sharkey <jsharkey@google.com>
Fri, 3 Feb 2017 00:10:17 +0000 (00:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 00:10:17 +0000 (00:10 +0000)
commitb058dc139dcea65def3d8c842aa37ea5dc2695a8
tree866bd200024decd6c9f5b9717493991a0ed3c2cd
parent4a4b6bfafbf024c27590533d7d0501ede2c47598
parent3e4faac39f77e3ad86cdca528d8981cb0c00daa0
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev
am: 3e4faac39f  -s ours

Change-Id: If1ea6da6679874ca13379222a28c529421c80b23