Skip to content
Commit 077372e2 authored by Miguel Aranda's avatar Miguel Aranda Committed by Automerger Merge Worker
Browse files

Merge "Add conscrypt updatable certificates." am: 0b62dccb am: cd360930 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2323439



Change-Id: I6113f57c111d1fa56120fd5ae2e0e8938ab5c05c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bb9f4937 cd360930
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment