| commit | d04997c9d24d55f0f66b250039119d84c792483b | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Aug 18 00:23:29 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 18 00:23:29 2021 +0000 |
| tree | 39e26acb372e65ef67687ff1668b0d6cc4dfc524 | |
| parent | 027afd8aa0c29d6083265be9845d1631cd4ab9ef [diff] | |
| parent | 9b36574906e382d654075c9471c5d8fc22126a6a [diff] |
[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 108de118e0 -s ours am: 0edf123a39 -s ours am: c17898d168 -s ours am: 9b36574906 -s ours am skip reason: Merged-In I37066e47a75968e46dae1c59dcbe8f301ff05424 with SHA-1 df1c63e1a1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/st/nfc/+/15571750 Change-Id: Ic89433c4b51c54ba41ca57d35259ec94693ff9d9