OSDN Git Service

[automerger skipped] Merge "RESTRICT AUTOMERGE: Recover shady content:// paths."...
authorJeff Sharkey <jsharkey@google.com>
Fri, 12 Oct 2018 05:56:08 +0000 (22:56 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Oct 2018 05:56:08 +0000 (22:56 -0700)
am: 58d1ac473e

Change-Id: Ibd2f4fcb800b7a48e7b9313083c88b4441d02f7c


Trivial merge