| commit | 31f3ae70d7161d136e8588bb2db856141b2e4ac5 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 08:29:19 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 08:29:19 2021 +0000 |
| tree | 3711d80f7c7c0f6daf73af4a78484747c6ee73f5 | |
| parent | 7d10236cadbe7bb0aaccff5b4fab033bd22bf7d7 [diff] | |
| parent | 081cc488f6980c69da75138f4b93c4ca27c149cf [diff] |
[automerger skipped] Merge Android 12 am: f4be0e805a -s ours am: dd8ff009e4 -s ours am: 1d403f3970 -s ours am: 081cc488f6 -s ours am skip reason: Merged-In I3a661bed1ae2ee68896f860d7f694ac67bbb9475 with SHA-1 8fd5536b7d is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/st/nfc/+/1847380 Change-Id: I69bdb49f0d2f4f39ca5d094cbd4345d5963d2523