diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-02-07 17:15:34 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-07 17:15:34 +0000 |
commit | 0ddbb9c04ddedc2a440772a76f93cab7a1176b8f (patch) | |
tree | 928f827ff8303fa81db462ac97c4a9bcb4c81b43 /keystore/java/android/security/KeyStoreSecurityLevel.java | |
parent | f8c947a06a846b3cdcdddd5b56bda8eb80336e15 (diff) | |
parent | f49a2e58ce260c1ec82388a26b70509798909b95 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 96f010c384 -s ours am: f49a2e58ce -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13507781
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie6bce586524bd0c1abe76ba1e82e7dc51145f83e
Diffstat (limited to 'keystore/java/android/security/KeyStoreSecurityLevel.java')
0 files changed, 0 insertions, 0 deletions