commit | 18d0635105ac378ca3d6643a53938d7fbe7639c4 | [log] [tgz] |
---|---|---|
author | George Chang <georgekgchang@google.com> | Thu Aug 05 16:02:58 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 05 16:02:58 2021 +0000 |
tree | 39e26acb372e65ef67687ff1668b0d6cc4dfc524 | |
parent | b6119e948c850437bbe660a536d7fd613ac69556 [diff] | |
parent | 09e3d233cc09d259a9f0c92355a5b4532bc0f94e [diff] |
[automerger skipped] Add a timer to prevent NFCC got stuck in ActiveRW am: 303e151afa am: 09e3d233cc -s ours am skip reason: Merged-In Ia15e000f7ba6a482e5ca69f23cb644eaf0d7b01c with SHA-1 303e151afa is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/st/nfc/+/15421892 Change-Id: I4be4f447857f7301b1942e6c48c6c026d5e66d7e