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

Skip to content
Commit ef382907 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 am: db94bf24

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



Change-Id: I0a7b1d5ed876d25b2fe089d3efe3523d5e7393b4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e41d29c5 db94bf24
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