tree 121767ee61f7cc0b109bb0eec1a1ef748115dea1
parent d23bdf88dfe99974ee9a620acd47d82b03eb9961
parent 0a87e803dd1646e4d7c9a6c0855f29e8ff4e013d
author Harshit Mahajan <harshitmahajan@google.com> 1707393043 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1707393043 +0000

[automerger skipped] Merge "Add flag for recoverability_detection" into main am: 0a87e803dd -s ours

am skip reason: Merged-In I555f5edb76ddc107c071b8b4c6909ef54ecf46eb with SHA-1 9a47a3f9ed is already in history

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

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