commit | 6ab2786d2e1b3ad7a9d513731a2e0d33ce76e3b2 | [log] [tgz] |
---|---|---|
author | George Chang <georgekgchang@google.com> | Fri Jul 14 08:54:42 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 14 08:54:42 2023 +0000 |
tree | 40a57e0db0b04e7c16207e18d600154ad85c02f5 | |
parent | a2b73faa34be884782de06351efad30b4c6adb31 [diff] | |
parent | 30c42bb3acc184da32fa30d5fe7328ad2d1409b8 [diff] |
[automerger skipped] Abort when entering timeout recovery with I2cResetPulse/I2cRecovery am: 30c42bb3ac -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: I2ef1ea6fc59c9ecae5633d869b964bc446d2e461 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>