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

Commit 9e86efe5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Respect timeout multiplier in PermissionControllerManager" am:... 

Merge "Respect timeout multiplier in PermissionControllerManager" am: 8c52e78a am: 238ada5d am: c6a7ba39 am: a80dae47 am: 2cca3401 am: 28f2b55c

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



Change-Id: I72e48af80e92380d910f64daa4a5b646e4c95635
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0d7d72c8 28f2b55c
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