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:53:49 +0000 (00:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 00:53:49 +0000 (00:53 +0000)
commit4d1c25ec432fe873c33719fd20112459ecf00229
tree368af5b5909ce75a6b2ad43cfbe1b5a2cc2bdaa8
parentbf16fab4e7e2829f219ed671616f062220531b47
parentb4c5c522e3c790a743ba6a8e2056359c08f60026
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

Change-Id: Iae12207ee70e0212fce0f04a34891b7e20f7aeb0