| commit | 7d4af72f64c23b417fe6f210374584dea70a2340 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 03:59:15 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:59:15 2020 +0000 |
| tree | ef7ba88cb14f02bea02a926695e7f2000fd3b004 | |
| parent | a2f4da51617631a6bbf975f20150940a49581d90 [diff] | |
| parent | 675aed33eeb652b1fb6e26ee37925f8e9744593a [diff] |
[automerger skipped] Merge Android R am: 8d017fe0b9 -s ours am: 424f9d48a6 -s ours am: a8ac53c99a -s ours am: 675aed33ee -s ours am skip reason: Change-Id I0c95c223bdf1983a328859775a77bde95d3c10bd with SHA-1 6a7763d5a2 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/1422318 Change-Id: I7817a7b2545c9414d378429cfe6a7e163324991a