| commit | b774964c5e24573adb9abf5fe7ea11b1ff8842b9 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Wed Nov 03 18:08:27 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 03 18:08:27 2021 +0000 |
| tree | 6d0e28da3df6ae324aa4ee4304e2271c49b8b818 | |
| parent | b6bc6164299ad524270347f4dcff96f96235f484 [diff] | |
| parent | 292e1c277f4d359422112edcfd367bc82eab9d5f [diff] |
[automerger skipped] Merge SP1A.211105.004 to aosp-master - DO NOT MERGE am: 292e1c277f -s ours am skip reason: Merged-In I222e620974de1437ff5766d5f7f7b35b15d018e1 with SHA-1 1c50a6f2c6 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/nxp/nfc/+/1877900 Change-Id: I481db51c786e2344799d23e0455342987a38cf39