OSDN Git Service

Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev am: ab80221a8c
authorJeff Sharkey <jsharkey@google.com>
Fri, 12 Oct 2018 05:14:40 +0000 (22:14 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Oct 2018 05:14:40 +0000 (22:14 -0700)
commit7656e1177feaff4a118f2d36f329d0cbaa5b3340
treee8cd99dea30b8176ff0d19f494d11a5f1772a134
parentcef9bae62dd3389a2aa132811e119be49d241dca
parent893598cd4ba738d916bc1b5dce303a166566f37b
Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev am: ab80221a8c
am: 893598cd4b

Change-Id: Idfabe38c9b34fa6414e3f5a9188e917d29f316f2
core/java/android/content/ContentProvider.java