| commit | d4a7ac677111a1fb43bbc553f09e8a264f243c5e | [log] [tgz] |
|---|---|---|
| author | Billy Huang <billyhuang@google.com> | Tue Jul 09 18:42:06 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 09 18:42:06 2024 +0000 |
| tree | aa2be112c169d4163487b5c5f7650267bb0d463e | |
| parent | f05e0f2ffbbe27f1d1388ee96c76a4c7fa3376b5 [diff] | |
| parent | 5cdd56eec66eab3570a8fcdf288a660f1da88515 [diff] |
[automerger skipped] Merge "TrustManagerServiceTest: Fix broken tests" into main am: 042f3b9d43 am: 5cdd56eec6 -s ours am skip reason: Merged-In Idb92137c2fbc8a50490b7cd1813670685f9a969d with SHA-1 adaa383860 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3163244 Change-Id: I153930af47caef78754683db1561bf67f51bc05a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>