diff options
author | Janis Danisevskis <jdanis@google.com> | 2020-11-12 00:48:26 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-12 00:48:26 +0000 |
commit | b90d33bd18c75c7d35b84007931c2690f33bd1b3 (patch) | |
tree | e98f811454c5f7ca938fd71d25d1f1b9fae0d545 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 19cd892b9e11d8cf4f36ad40eef445fc6ae26cf4 (diff) | |
parent | 7662e81e987c831479937f591488b7a6303da328 (diff) |
Merge "Keystore 2.0 SPI: Update KeyInfo and KeyGenParameterSpec" am: 17f24b5799 am: 7d49ae705e am: 7662e81e98
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470091
Change-Id: I8a3f19ea8cfe16dd8a6d06007306ccaa9ed7257a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions