| commit | 93edc7d174095244f2e97331df67392177efead7 | [log] [tgz] |
|---|---|---|
| author | ZAITI Reda <reda.zaiti@thalesgroup.com> | Wed Jul 29 02:14:59 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 29 02:14:59 2020 +0000 |
| tree | 79438e8c23ec0761c48e925ac1a5b9a73ceaab79 | |
| parent | 7dfffa1a3a66a369f015996df004bcbc3a694e46 [diff] | |
| parent | 5bc677d13cd2f326abc38b24aba74fcbec6d8b14 [diff] |
Merge remote-tracking branch 'origin/upstream-master' am: 5bc677d13c Original change: https://android-review.googlesource.com/c/platform/hardware/st/secure_element2/+/1370344 Change-Id: I2fb6d8b2c9d6abdc61802fe3ed864e081ed0be43