commit | 0ca0eefe9be787a2888c74a2ca653a7af15a01aa | [log] [tgz] |
---|---|---|
author | Jacob Hobbie <jacobhobbie@google.com> | Tue Aug 29 20:09:46 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 29 20:09:46 2023 +0000 |
tree | c09ab812eb68faaba664d5f4b571539da94ed9d3 | |
parent | ea3ebd64de5cd95163dfb7026ef6477687559bc8 [diff] | |
parent | 87af05bfb8463528a9e29ab80a13f77521d27fa7 [diff] |
[automerger skipped] Fix timer bug in TrustManagerService. am: 87af05bfb8 -s ours am skip reason: Merged-In I75d58e09848d4123bb55ea9a36cab739504ca6e8 with SHA-1 c539a470cb is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2729595 Change-Id: If71a38597bf5ef39a5b56d26ce36c8188fa729f8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>