[automerger skipped] Merge "Client side implementation of Trusty IRPC HAL" am: 8fe5602099
am: b3cae813c5
-s ours
am skip reason: Merged-In I32c30ce2dc44e95ff91574ce405f10e3b5dc9699 with SHA-1 5ac2c87c7a
is already in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1756551
Change-Id: I0286e8d78284de1fdc943816de979851d95e2c62
This commit is contained in:
commit
6f131ea404