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