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

Commit d27aa145 authored by Jean Chalard's avatar Jean Chalard Committed by Automerger Merge Worker
Browse files

Merge "Guess the right encap/timeout for the VCN" am: ac189d4a am:... 

Merge "Guess the right encap/timeout for the VCN" am: ac189d4a am: 0b29979a am: ff89cd51 am: 9e49afe9 am: 5c20ebdb am: 16236f03

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



Change-Id: I0aeac73f457e603614b63741dcfce617800ed15e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 58f40c81 16236f03
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