Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db94bf24 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

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

Merge changes from topics "recoveryTimeUnit", "vpnRecovery" am: 9273181f am: 727e0d6f am: 57fd8ddf am: 8138dc25

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



Change-Id: Icd1154b818738f42066853e9897a095243ee4caa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8d684dbd 8138dc25
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment