| commit | 027afd8aa0c29d6083265be9845d1631cd4ab9ef | [log] [tgz] |
|---|---|---|
| author | George Chang <georgekgchang@google.com> | Thu Aug 05 16:12:43 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 05 16:12:43 2021 +0000 |
| tree | 39e26acb372e65ef67687ff1668b0d6cc4dfc524 | |
| parent | c56e5c28c5151e24c4353e6c8408a85cd6381000 [diff] | |
| parent | 18d0635105ac378ca3d6643a53938d7fbe7639c4 [diff] |
[automerger skipped] Add a timer to prevent NFCC got stuck in ActiveRW am: 303e151afa am: 09e3d233cc -s ours am: 18d0635105 -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: I9c4d5ce69746fda543c00731407e8432ba6bed3e