tree c9f90c2a59357c34b6f7840298ee1495f1b184b3
parent d385c39b9f2319dba24fe52bc8cdc4ffb4f17953
parent 90bf3a9ef0bed411b4f54f9c25d873c396fc685c
author Harshit Mahajan <harshitmahajan@google.com> 1708121108 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1708121108 +0000

Merge "[RescuePartyTest] Mocking CrashRecoveryProperties" into main am: 90bf3a9ef0

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

Change-Id: Ib576632e053a5a8e7c54b445e339f7868a9598f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>