tree 40a57e0db0b04e7c16207e18d600154ad85c02f5
parent 81cef68614041500799f258158be117e3da302f5
parent 6ab2786d2e1b3ad7a9d513731a2e0d33ce76e3b2
author George Chang <georgekgchang@google.com> 1689330452 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1689330452 +0000

[automerger skipped] Abort when entering timeout recovery with I2cResetPulse/I2cRecovery am: 30c42bb3ac -s ours am: 6ab2786d2e -s ours

am skip reason: Merged-In Iba64a513ed63fec30ce624db63aabc3fcea527d2 with SHA-1 99810e76d4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/st/nfc/+/24058383

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