diff options
| author | Bill Yi <byi@google.com> | 2021-02-19 05:53:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-19 05:53:40 +0000 |
| commit | 8a554b286f1ac97fc999496b786fb6cf38b649a8 (patch) | |
| tree | b10571dc6a1b6dfa55b92e0419c39e6a9535a5b8 /keystore/java/android/security/AndroidKeyStoreMaintenance.java | |
| parent | 0898ba69adb41b447366868543dc8c9773b47293 (diff) | |
| parent | ae4581d42153a9580c96a805bf6e0e197cca4f9d (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: ae4581d421 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13619329
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id10c35ef63965645a5d964744e1ac381ae5e8f91
Diffstat (limited to 'keystore/java/android/security/AndroidKeyStoreMaintenance.java')
0 files changed, 0 insertions, 0 deletions