commit | c17898d1683422fbcee3fe3d5eba65d29db94492 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Aug 17 19:46:05 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 17 19:46:05 2021 +0000 |
tree | 39e26acb372e65ef67687ff1668b0d6cc4dfc524 | |
parent | df1c63e1a178987174f5ec0a204d3bf2d541fc69 [diff] | |
parent | 0edf123a39c7fe4ba35ad4502600c35ab58c20f0 [diff] |
[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 108de118e0 -s ours am: 0edf123a39 -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: I54fc529ff45c6bd02becc31e03b9b779a195edd2