OSDN Git Service

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am: 7115ad711...
authorJeff Sharkey <jsharkey@google.com>
Fri, 3 Feb 2017 00:46:45 +0000 (00:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 00:46:45 +0000 (00:46 +0000)
commit7a6bd686a37e4864f30f84ef0a5a49ef9ddd06c1
treefec2c72a0de19d85271d531b0db5194861c499c1
parentd30514edc64b9888d8cd0d629dd3ff417000a0ff
parenta7388f1ed41dc0a9403bafe4401a22a36d932bcd
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am: 7115ad7119 am: fa22018223 am: 8469d52d41  -s ours am: f68199a472
am: a7388f1ed4

Change-Id: I92e758c2f2a5d978b9fcd4779e486711f7b1ebe3