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 01:30:51 +0000 (01:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 01:30:51 +0000 (01:30 +0000)
commit0387fd89f2c5ce06c97db0813b8f85a6dc4665be
treedd12e386df66059cac6c17f98bb63dddd96d130c
parent87ae27b020abe7245d89d961134246572658f769
parent34df10ec985354ea70059c7f4ea5c1744da3b8e6
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f  -s ours am: b058dc139d am: d20b04a41d  -s ours am: 4b0164b27c am: 00af0a6d2c am: b4c5c522e3 am: 4d1c25ec43  -s ours am: 43f79eec8b am: cecf30c3a2 am: 5a50d2b12c
am: 34df10ec98

Change-Id: I74e19a0c1a310084ca5785ed8d8bc5988cce2258