commit | fba529a97767bdc44e9afa4f3e8bfd9b97846041 | [log] [tgz] |
---|---|---|
author | ZAITI Reda <reda.zaiti@thalesgroup.com> | Wed Jul 29 03:16:05 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 29 03:16:05 2020 +0000 |
tree | 79438e8c23ec0761c48e925ac1a5b9a73ceaab79 | |
parent | 39123c4b23be85aa9cf7e9ac31773907f7d47ec6 [diff] | |
parent | 813c4f2bb6e34a3e4998abf813bc74eb141ba4ed [diff] |
Merge remote-tracking branch 'origin/upstream-master' am: 5bc677d13c am: 93edc7d174 am: c09ebc7706 am: 813c4f2bb6 Original change: https://android-review.googlesource.com/c/platform/hardware/st/secure_element2/+/1370344 Change-Id: I44aefaa57f46477378d8f5cca7666df2c6fab1cc