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:28:54 +0000 (01:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 01:28:54 +0000 (01:28 +0000)
commit0792846ea58e136d9bcd471189e5e446e25ddb6f
treedd12e386df66059cac6c17f98bb63dddd96d130c
parentb93bc585f0915b809de300d5611b3fe08382dbdb
parentce15555148eb0868dda2cc3db597a3818199e119
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5  -s ours am: f82c373074 am: 8c9ff68173 am: 4b3c59005b am: 394357761e  -s ours am: bafa3c1d3b am: 7cd3c47c29 am: 770eff87cd
am: ce15555148

Change-Id: Iae6d62ce80959214aac7299ff1077a54d69e03b5