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

Skip to content
Commit 2cca3401 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

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



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