Skip to content
Commit 65310b11 authored by Janis Danisevskis's avatar Janis Danisevskis Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Keystore 2.0: Make VPN Keystore 2.0 ready." am:... 

[automerger skipped] Merge "Keystore 2.0: Make VPN Keystore 2.0 ready." am: 421c5739 am: da3d7dae am: 8f021be7 -s ours

am skip reason: Change-Id I27975113896ea137260a9f94a34fb1c3ca173fe3 with SHA-1 4ba2f0c6 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0bd42249b22890ef71ece31e70e7c9a61cdb50e1
parents 73c020fc 8f021be7
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