| commit | df1c63e1a178987174f5ec0a204d3bf2d541fc69 | [log] [tgz] |
|---|---|---|
| author | George Chang <georgekgchang@google.com> | Thu Aug 05 15:43:44 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 05 15:43:44 2021 +0000 |
| tree | 39e26acb372e65ef67687ff1668b0d6cc4dfc524 | |
| parent | 3d75464cd0d1bbc08256150632be6a84738fa65a [diff] | |
| parent | 303e151afaaac8348398cb9fa91a69e9476bfad0 [diff] |
[automerger skipped] Add a timer to prevent NFCC got stuck in ActiveRW am: 303e151afa -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: I37066e47a75968e46dae1c59dcbe8f301ff05424