diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-07-08 18:39:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-08 18:39:40 +0000 |
| commit | 42223578a2979a8c2fdcda3afcbfda541a1b54ae (patch) | |
| tree | b360b5ade410a7e35ecd61104abbf189224f91f8 /core/java/android/widget/TextView.java | |
| parent | 22573aa3375cb41fce6d2d4d09853be639bb1908 (diff) | |
| parent | 355a282b71185a944f1c92c42a17eab89606fb78 (diff) | |
[automerger skipped] Merge "Keystore 2.0 SPI: Add EC_CURVE tag on key generation." am: f90282c17e am: 355a282b71 -s ours
am skip reason: Merged-In I2e7dd4868abda85d244e73592ff12d688f5c21fc with SHA-1 5a3c880534 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1760665
Change-Id: I6d347fc17373f9ae0f4bb79e3af8952218daeef9
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions