| commit | 4c7844f1032b445d3b17bd2c142e260028732419 | [log] [tgz] |
|---|---|---|
| author | Jacob Hobbie <jacobhobbie@google.com> | Tue Aug 29 20:57:37 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 29 20:57:37 2023 +0000 |
| tree | 6b8cf0a0a72a6a26414df9b0bc6355f788bbc05c | |
| parent | a683cc24e904a9016b970914bbd9728740970852 [diff] | |
| parent | 0ca0eefe9be787a2888c74a2ca653a7af15a01aa [diff] |
[automerger skipped] Fix timer bug in TrustManagerService. am: 87af05bfb8 -s ours am: 0ca0eefe9b -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: Iff34f7605d2628b17cfcf1faa74cc3b54a43e06b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>