| commit | 17793e3c260964aa2d14b19a606add577764a7e6 | [log] [tgz] |
|---|---|---|
| author | SongFerng Wang <songferngwang@google.com> | Tue Feb 18 03:31:57 2025 -0800 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 18 03:31:57 2025 -0800 |
| tree | f3cde891a1e428b3b0c7021cf7929cbba214ee25 | |
| parent | 0be57cf31145c8830d892905d402af0fab3df504 [diff] | |
| parent | fcdd8bb6d99dfe4667efdacf7ce5230c3ce14a0d [diff] |
[automerger skipped] Merge "test: Make mMockitoRule public for AppWithAdminGrantedPermissionsCounterTest" into main am: 4dca839abd am: fcdd8bb6d9 -s ours am skip reason: Merged-In Id2ecf785655dfcca9f65fc3ee64ffae11fc78e88 with SHA-1 62c2800b3f is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3448908 Change-Id: I80372a4be56b56337b806b96370312c2b33f725d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>