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)
am: ab80221a8c

Change-Id: I61ef6b1a189ef345326a5455ff17b47d67f18f8d


Trivial merge