Skip to content
Commit 727e0d6f authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge changes from topics "recoveryTimeUnit", "vpnRecovery" am: 9273181f 

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



Change-Id: Ie0b5d315e7a3c6fcda684a5195062abe55d7d6e2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 837c8f67 9273181f
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