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

Commit 745322cc authored by Jacob Hobbie's avatar Jacob Hobbie Committed by Automerger Merge Worker
Browse files

Merge "Fix timer bug in TrustManagerService." into udc-dev am: 326dd9c1 am:... 

Merge "Fix timer bug in TrustManagerService." into udc-dev am: 326dd9c1 am: 53065e57 am: c37166f2 am: 7bd50041

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



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