OSDN Git Service

Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev
authorJeff Sharkey <jsharkey@google.com>
Fri, 12 Oct 2018 04:56:21 +0000 (21:56 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Oct 2018 04:56:21 +0000 (21:56 -0700)
commit893598cd4ba738d916bc1b5dce303a166566f37b
tree2d7faf2544bf8bb4a09d4323f770d9a766ef16e1
parent80c65f6ce7e6eace5dd54df729bd2f426343152e
parentab80221a8cf0e2f2575b72b502de3d7594cb1a22
Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev
am: ab80221a8c

Change-Id: I61ef6b1a189ef345326a5455ff17b47d67f18f8d