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