tree 18b2238fa498a69a887d3cede1b35c2188d6ab4b
parent f85bd2b22d7197397449d5657d67d7ac8a2cc1dd
parent 7656e1177feaff4a118f2d36f329d0cbaa5b3340
author Jeff Sharkey <jsharkey@google.com> 1539321654 -0700
committer android-build-merger <android-build-merger@google.com> 1539321654 -0700

[automerger skipped] Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev am: ab80221a8c am: 893598cd4b
am: 7656e1177f  -s ours

Change-Id: I95387eef7f018aceec664807c015eef768fbb4b3