tree ec6664c5813b9e9d07f2388a8d391815b03bd1c0
parent 9e71447e41ef345517a0c235a56ad1210074ca55
parent 1ad90da988e4c2763de8c124a2adbb5a1fe0d130
author Treehugger Robot <treehugger-gerrit@google.com> 1601473979 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1601473979 +0000

Merge "Revert "Check security context in CA certificate injection"" am: 2dd1279944 am: 1ad90da988

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/1435260

Change-Id: I0035acfd4534b410a3c662d30228cf1be8f8d27b